Merge "emulator: fix widevine drm vndbinder denial" into oc-mr1-dev
diff --git a/core/Makefile b/core/Makefile
index 0c36dc0..4a4760f 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -81,6 +81,9 @@
# prop.default
ifdef property_overrides_split_enabled
INSTALLED_DEFAULT_PROP_TARGET := $(TARGET_OUT)/etc/prop.default
+INSTALLED_DEFAULT_PROP_OLD_TARGET := $(TARGET_ROOT_OUT)/default.prop
+ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_DEFAULT_PROP_OLD_TARGET)
+$(INSTALLED_DEFAULT_PROP_OLD_TARGET): $(INSTALLED_DEFAULT_PROP_TARGET)
else
# legacy path
INSTALLED_DEFAULT_PROP_TARGET := $(TARGET_ROOT_OUT)/default.prop
@@ -115,7 +118,7 @@
$(hide) build/tools/post_process_props.py $@
ifdef property_overrides_split_enabled
$(hide) mkdir -p $(TARGET_ROOT_OUT)
- $(hide) ln -sf system/etc/prop.default $(TARGET_ROOT_OUT)/default.prop
+ $(hide) ln -sf system/etc/prop.default $(INSTALLED_DEFAULT_PROP_OLD_TARGET)
endif
# -----------------------------------------------------------------
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index f0e7f84..1e2611a 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -105,7 +105,7 @@
# When you increment the PLATFORM_SDK_VERSION please ensure you also
# clear out the following text file of all older PLATFORM_VERSION's:
# cts/tests/tests/os/assets/platform_versions.txt
- PLATFORM_SDK_VERSION := 26
+ PLATFORM_SDK_VERSION := 27
endif
ifndef PLATFORM_JACK_MIN_SDK_VERSION
diff --git a/target/board/treble_common_32.mk b/target/board/treble_common_32.mk
index fb19d79..2c3447b 100644
--- a/target/board/treble_common_32.mk
+++ b/target/board/treble_common_32.mk
@@ -16,5 +16,5 @@
include build/make/target/board/treble_common.mk
-# Partition size is default 1GB (1024MB) for 32 bits projects
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1073741824
+# Partition size is default 906MB for 32 bits projects
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 950009856
diff --git a/target/product/embedded.mk b/target/product/embedded.mk
index aefba43..7efa686 100644
--- a/target/product/embedded.mk
+++ b/target/product/embedded.mk
@@ -20,7 +20,7 @@
PRODUCT_PACKAGES += \
adb \
adbd \
- android.hardware.configstore@1.1-service \
+ android.hardware.configstore@1.0-service \
android.hidl.allocator@1.0-service \
android.hidl.memory@1.0-impl \
atrace \