diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-09-08 15:04:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-09-08 15:04:57 +0000 |
| commit | 212660221685ac492997e706b670249aab1c465b (patch) | |
| tree | 726a7a0f9bf0b45b2ecd97d9fefa733b260edd2c | |
| parent | f999a9d145c89cd93dd2004830aba5b5a53b0aaf (diff) | |
| parent | 607138be38e4af8387f5f8c6442a3f1dc153cb7b (diff) | |
| download | build-android-s-beta-5.tar.gz | |
Merge "Allow overriding SOONG_CONFIG_art_module_source_build to false."android-s-beta-5android-s-beta-5
| -rw-r--r-- | core/android_soong_config_vars.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index fe97047a78..2197eb968c 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -36,7 +36,9 @@ ifeq (,$(filter art_module,$(SOONG_CONFIG_NAMESPACES))) $(call add_soong_config_namespace,art_module) SOONG_CONFIG_art_module += source_build endif -ifneq (,$(findstring .android.art,$(TARGET_BUILD_APPS))) +ifneq (,$(SOONG_CONFIG_art_module_source_build)) + # Keep an explicit setting. +else ifneq (,$(findstring .android.art,$(TARGET_BUILD_APPS))) # Build ART modules from source if they are listed in TARGET_BUILD_APPS. SOONG_CONFIG_art_module_source_build := true else ifeq (,$(filter-out modules_% mainline_modules_%,$(TARGET_PRODUCT))) |