Merge "Make mainline device enable property split"

2019-03-25 18:23:26 +00:00
parent 94fa0e75cb 018bd137b7
commit 072795054a
2 changed files with 3 additions and 3 deletions
--- 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 :=

--- 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