diff options
| author | Martin Stjernholm <mast@google.com> | 2020-12-10 10:39:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-10 10:39:52 +0000 |
| commit | 8795da5bcd28ff511c03685f32ebce71a76a2af1 (patch) | |
| tree | de0ffba964eaef2ae36729bd87a261e63c3438e1 /BoardConfigCommon.mk | |
| parent | ab5926366e20c42abd101b622e00f2bbf0800eb1 (diff) | |
| parent | fc923314d58ed31112407191ea0c563c120caf8e (diff) | |
| download | art-8795da5bcd28ff511c03685f32ebce71a76a2af1.tar.gz | |
Merge "Introduce a Soong config variable to flip to ART Module sources when prebuilts are preferred by default." am: ba62030943 am: 05b65151d2 am: fc923314d5
Original change: https://android-review.googlesource.com/c/device/generic/art/+/1513781
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ieff47436b1e4dc657fdc6877798963fcd0f8c6b6
Diffstat (limited to 'BoardConfigCommon.mk')
| -rw-r--r-- | BoardConfigCommon.mk | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index f2dfec8..2dd5ec3 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -24,3 +24,13 @@ TARGET_CPU_SMP := true # Flatten APEX packages to make them simpler to use in # ART testing/benchmarking environments. TARGET_FLATTEN_APEX := true + +# Enable ART Module top level apex/sdk/module_export modules. When they are +# enabled the ART Module prebuilts (packages/modules/ArtPrebuilt and +# prebuilts/module_sdk/art) cannot be present with prefer:true in the build +# tree. +# TODO(b/174997203): Clean this up when there is a better way to switch between +# prebuilts and sources. +SOONG_CONFIG_NAMESPACES += art_module +SOONG_CONFIG_art_module += source_build +SOONG_CONFIG_art_module_source_build := true |