From 018bd137b7e35932fc1d5144caa5646e4378f77f Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Fri, 22 Mar 2019 14:12:26 +0000 Subject: [PATCH] Make mainline device enable property split This setting moves the PRODUCT_PROPERTY_OVERRIDES to the vendor partition. Bug: 80410283 Test: tail system/build.prop | grep ro.carrier= (empty) Change-Id: I30d564fbd2dd3b56763ccff77979b223857f1c2f --- target/board/BoardConfigGsiCommon.mk | 3 --- target/board/BoardConfigMainlineCommon.mk | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk index a0f43afbd8..d53995c03b 100644 --- a/target/board/BoardConfigGsiCommon.mk +++ b/target/board/BoardConfigGsiCommon.mk @@ -6,9 +6,6 @@ include build/make/target/board/BoardConfigMainlineCommon.mk -# Enable system property split for Treble -BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true - # This flag is set by mainline but isn't desired for GSI. BOARD_USES_SYSTEM_OTHER_ODEX := diff --git a/target/board/BoardConfigMainlineCommon.mk b/target/board/BoardConfigMainlineCommon.mk index ed69357f1b..fc554089d1 100644 --- a/target/board/BoardConfigMainlineCommon.mk +++ b/target/board/BoardConfigMainlineCommon.mk @@ -46,3 +46,6 @@ BOARD_CHARGER_ENABLE_SUSPEND := true # Enable A/B update AB_OTA_UPDATER := true AB_OTA_PARTITIONS := system + +# Enable system property split for Treble +BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true