Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e22baa7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Allow overriding SOONG_CONFIG_art_module_source_build to false." am: 21266022 am: efd51012

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

Change-Id: Iadb032525bf451d6c7061f67ffbe83a1f7956d5a
parents 9455e746 efd51012

core/android_soong_config_vars.mk

+3 −1
Original line number Diff line number Diff line
@@ -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)))