Merge "Allow overriding SOONG_CONFIG_art_module_source_build to false." am: 2126602216

Original change: https://android-review.googlesource.com/c/platform/build/+/1801147

Change-Id: I4222cf04cc76c1e3e8549e3a384218d3f4cb22b7
This commit is contained in:
Treehugger Robot
2021-09-08 15:26:01 +00:00
committed by Automerger Merge Worker

View File

@@ -44,7 +44,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)))