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

Commit 607138be authored by Martin Stjernholm's avatar Martin Stjernholm
Browse files

Allow overriding SOONG_CONFIG_art_module_source_build to false. 

Useful for local testing etc.

Cherry-picked from http://ag/15754315.

Test: env SOONG_CONFIG_art_module_source_build=false \
          MODULE_BUILD_FROM_SOURCE=true \
        build/soong/soong_ui.bash \
          --dumpvar-mode SOONG_CONFIG_art_module_source_build
  return false
Bug: 172480615
Change-Id: I50187408a01e0c6f5ecea12fe3a423e1c5d93612
Merged-In: I50187408a01e0c6f5ecea12fe3a423e1c5d93612
parent b94feb7c

core/android_soong_config_vars.mk

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