commit | cc85e0377cf0bbc5739f1402e4a4b646265dd402 | [log] [tgz] |
---|---|---|
author | Anton Hansson <hansson@google.com> | Mon Mar 25 11:34:15 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Mar 25 11:34:15 2019 -0700 |
tree | 3806ff57cff4e59728b82c1e169c4e8681b5a525 | |
parent | fd946975d004c0bfe0ece0d59ac520798e4719af [diff] | |
parent | 072795054a4284924067c5e7e9fa1ca56cb9598a [diff] |
Merge "Make mainline device enable property split" am: 072795054a Change-Id: Ib7539f1d076cc238917b3b82162419f9451aa0bd
diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk index a0f43af..d53995c 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 ed69357..fc55408 100644 --- a/target/board/BoardConfigMainlineCommon.mk +++ b/target/board/BoardConfigMainlineCommon.mk
@@ -46,3 +46,6 @@ # Enable A/B update AB_OTA_UPDATER := true AB_OTA_PARTITIONS := system + +# Enable system property split for Treble +BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true