commit bc1e820f25c12885510f7d384d5811721e52f80f
author Treehugger Robot <treehugger-gerrit@google.com> Mon Mar 11 16:10:22 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 11 16:10:22 2019 +0000
tree 0178d2e87ac3f8c18e94c6ceee257d72865a3d8d
parent 15e76e38489280f6504c7d0d73b7e8e70572b14b
parent ace19f63fec6a72fc19e4c9ad065b3dfd2635dfd

Merge "Fix some system property missing problem on aosp_* targets"

target/product/gsi_common.mk

diff --git a/target/product/gsi_common.mk b/target/product/gsi_common.mk
index e87309b..fb0478d 100644
--- a/target/product/gsi_common.mk
+++ b/target/product/gsi_common.mk
@@ -24,12 +24,12 @@
 $(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk)
 
 # Additional settings used in all AOSP builds
-PRODUCT_PROPERTY_OVERRIDES := \
+PRODUCT_PROPERTY_OVERRIDES += \
     ro.config.ringtone=Ring_Synth_04.ogg \
     ro.config.notification_sound=pixiedust.ogg
 
 # The mainline checking whitelist, should be clean up
-PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST := \
+PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
     system/app/messaging/messaging.apk \
     system/app/PhotoTable/PhotoTable.apk \
     system/app/WAPPushManager/WAPPushManager.apk \