diff options
| author | 2021-07-14 21:07:34 +0000 | |
|---|---|---|
| committer | 2021-07-14 21:07:34 +0000 | |
| commit | 15f7075d78ac46dcba12a22caae1be17bfd15dd7 (patch) | |
| tree | 0a8e986d73317c4ef7c58771eca90a4639315654 | |
| parent | 304da3988d59b4fdd4c7a898bde37c9e3f0d1c60 (diff) | |
| parent | 3a52c4f4fd65e85c0771a07ff3b05d65cba72ecb (diff) | |
Merge "Build the ART module from source if other Mainline modules are."
| -rw-r--r-- | core/android_soong_config_vars.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 64a6449e04..46b588eec2 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -43,6 +43,9 @@ else ifeq (,$(filter-out modules_% mainline_modules_%,$(TARGET_PRODUCT))) # Always build from source for the module targets. This ought to be covered by # the TARGET_BUILD_APPS check above, but there are test builds that don't set it. SOONG_CONFIG_art_module_source_build := true +else ifdef MODULES_BUILD_FROM_SOURCE + # Build from source if other Mainline modules are. + SOONG_CONFIG_art_module_source_build := true else ifneq (,$(filter true,$(NATIVE_COVERAGE) $(CLANG_COVERAGE))) # Always build ART APEXes from source in coverage builds since the prebuilts # aren't built with instrumentation. |