Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e40cc936 authored by SzuWei Lin's avatar SzuWei Lin
Browse files

Enforce property split in GSI 

Pure GSI build targets has no vendor partition, such as
aosp_$arch_ab and gsi_$arch. The system properties defined by
PRODUCT_PROPERTY_OVERRIDES will be in /system/build.prop.

The patch defined a fake BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE to
let these system properties flow to vendor and won't pollute the
system.img.

The bug also move some properties to /product/build.prop.

Bug: 135508595
Bug: 131162245
Bug: 134781120
Test: check the /system/build.prop do not have "ro.carrier=unknown"
Test: adb remount on GSI Q on P
Change-Id: Ib200d66cf98fea572c26338e058bce29eb5e0cd7
Merged-In: Ib200d66cf98fea572c26338e058bce29eb5e0cd7
(cherry picked from commit 711d696eb3af759c63c416b0224faeac1f6c04f1)
parent 0c355124

target/board/BoardConfigGsiCommon.mk

+3 −0
Original line number Diff line number Diff line
@@ -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 :=

target/product/gsi_common.mk

+2 −2
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_product.mk) 
$(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk)



# 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 += \