diff options
| author | Paul Duffin <paulduffin@google.com> | 2022-06-23 18:05:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-23 18:05:22 +0000 |
| commit | 5015273fa33b3326cf654c7b028280a66e2b0d9e (patch) | |
| tree | 2f4ae1d4a156d948c3e917ff0a67226467aa4715 | |
| parent | 3ef5ea6bc7a595b13e910646e3e47a31cd19dffc (diff) | |
| parent | dccd189954c52d2726cfd287a7a230f4b837f285 (diff) | |
| download | build-5015273fa33b3326cf654c7b028280a66e2b0d9e.tar.gz | |
Do not override setting of SOONG_CONFIG_<m>_module_source_build am: dccd189954
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19033310
Change-Id: I0afaabf48d53e9a2cdc9447a88c32ca3d2bda9a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/android_soong_config_vars.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 259035e054..483beaff3b 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -80,7 +80,8 @@ INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES := \ wifi \ $(foreach m, $(INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES),\ - $(call soong_config_set,$(m)_module,source_build,$(MODULE_BUILD_FROM_SOURCE))) + $(if $(call soong_config_get,$(m)_module,source_build),,\ + $(call soong_config_set,$(m)_module,source_build,$(MODULE_BUILD_FROM_SOURCE)))) # Apex build mode variables ifdef APEX_BUILD_FOR_PRE_S_DEVICES |