Merge "Allow overriding SOONG_CONFIG_art_module_source_build to false." am: 2126602216
am: efd51012ed
Original change: https://android-review.googlesource.com/c/platform/build/+/1801147 Change-Id: Iadb032525bf451d6c7061f67ffbe83a1f7956d5a
This commit is contained in:
@@ -44,7 +44,9 @@ ifeq (,$(filter art_module,$(SOONG_CONFIG_NAMESPACES)))
|
|||||||
$(call add_soong_config_namespace,art_module)
|
$(call add_soong_config_namespace,art_module)
|
||||||
SOONG_CONFIG_art_module += source_build
|
SOONG_CONFIG_art_module += source_build
|
||||||
endif
|
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.
|
# Build ART modules from source if they are listed in TARGET_BUILD_APPS.
|
||||||
SOONG_CONFIG_art_module_source_build := true
|
SOONG_CONFIG_art_module_source_build := true
|
||||||
else ifeq (,$(filter-out modules_% mainline_modules_%,$(TARGET_PRODUCT)))
|
else ifeq (,$(filter-out modules_% mainline_modules_%,$(TARGET_PRODUCT)))
|
||||||
|
Reference in New Issue
Block a user