tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Remove SOONG_CONFIG_art_module_source_build fallback" am: e50553da9b am: e4da9dc874 am: 7e4ece7569

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

Change-Id: I06d39e1c07178995913e8aef8511e33ccf255bba
This commit is contained in:
Treehugger Robot 2022-03-14 21:10:32 +00:00 committed by Automerger Merge Worker
commit 9440475034
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/android_soong_config_vars.mk
View file

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