commit 345ed53d98e00b504c747785ac7f5ce4ad4121d4
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jun 20 01:53:15 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 20 01:53:15 2019 +0000
tree 5cec95351b6ec11057b8afbe0e0098639ab9f8c3
parent 9bcf0376ab528ed9abeb7a4a9f81ce67ce6a4572
parent 79e0d25c33036fc152745cc0f42f96659a09eb0d

Merge "Enforce property split in GSI"

target/board/BoardConfigGsiCommon.mk

diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk
index 96fd07b..702ef3c 100644
--- a/target/board/BoardConfigGsiCommon.mk
+++ b/target/board/BoardConfigGsiCommon.mk
@@ -50,6 +50,9 @@
 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216
 
+# Setup a vendor image to let PRODUCT_PROPERTY_OVERRIDES does not affect GSI
+BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
+
 # Disable 64 bit mediadrmserver
 TARGET_ENABLE_MEDIADRM_64 :=
 

target/product/gsi_common.mk

diff --git a/target/product/gsi_common.mk b/target/product/gsi_common.mk
index 064cf03..7578f92 100644
--- a/target/product/gsi_common.mk
+++ b/target/product/gsi_common.mk
@@ -29,9 +29,9 @@
     ro.apex.updatable=false
 
 # Additional settings used in all AOSP builds
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_PRODUCT_PROPERTIES += \
     ro.config.ringtone=Ring_Synth_04.ogg \
-    ro.config.notification_sound=pixiedust.ogg
+    ro.config.notification_sound=pixiedust.ogg \
 
 # The mainline checking whitelist, should be clean up
 PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \