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

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

Merge "Remove SOONG_CONFIG_art_module_source_build fallback" am: e50553da 

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

Change-Id: Ia164e190f633154810cae725315d8543d10a053e
parents 25e6cc95 e50553da

core/android_soong_config_vars.mk

+0 −6
Original line number Diff line number Diff line
@@ -59,12 +59,6 @@ else 
  MODULE_BUILD_FROM_SOURCE := $(BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE)

endif



# TODO(b/220940864): Remove when build scripts have been changed to use

# ART_MODULE_BUILD_FROM_SOURCE instead of SOONG_CONFIG_art_module_source_build

ifneq (,$(SOONG_CONFIG_art_module_source_build))

  ART_MODULE_BUILD_FROM_SOURCE := $(SOONG_CONFIG_art_module_source_build)

endif



ifneq (,$(ART_MODULE_BUILD_FROM_SOURCE))

  # Keep an explicit setting.

else ifneq (,$(findstring .android.art,$(TARGET_BUILD_APPS)))