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

Commit 94404750 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... 

Merge "Remove SOONG_CONFIG_art_module_source_build fallback" am: e50553da am: e4da9dc8 am: 7e4ece75

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

Change-Id: I06d39e1c07178995913e8aef8511e33ccf255bba
parents 166939c0 7e4ece75

core/android_soong_config_vars.mk

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

  MODULE_BUILD_FROM_SOURCE := $(BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE)

endif

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))

ifneq (,$(ART_MODULE_BUILD_FROM_SOURCE))

  # Keep an explicit setting.

  # Keep an explicit setting.

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

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