Merge "Enforce property split in GSI"

am: 345ed53d98

Change-Id: Id3593c2dc1f3dd9f9eb8b787a9fa576a0dc40b7c
This commit is contained in:
SzuWei Lin
2019-06-19 19:37:25 -07:00
committed by android-build-merger
2 changed files with 5 additions and 2 deletions

View File

@@ -50,6 +50,9 @@ endif
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 :=

View File

@@ -29,9 +29,9 @@ PRODUCT_PRODUCT_PROPERTIES += \
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 += \