| commit | 802e6faa776486da7f39a43e611d6602b6b0b2b9 | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Mon Mar 25 11:41:07 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Mar 25 11:41:07 2019 -0700 |
| tree | 845cdd014c95a43da497bdd8d7928768fffefeff | |
| parent | 691c979b6205d06296f3f4ebfef61792c3b675e8 [diff] | |
| parent | cc85e0377cf0bbc5739f1402e4a4b646265dd402 [diff] |
Merge "Make mainline device enable property split" am: 072795054a am: cc85e0377c Change-Id: I931d762c4c008874d05267e4583528eebca25eec
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