commit e50553da9b4184d6d64273e23cdc261a8a77fb77
author Treehugger Robot <treehugger-gerrit@google.com> Mon Mar 14 19:33:55 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 14 19:33:55 2022 +0000
tree db98eca3798050d59320fa3a6123a7cc8ba01769
parent 72815bdf004d88933eb6d071326c13ce62eab83f
parent 8f15becda4ea88dcba15c1ca7cc42cff1b7961c4

Merge "Remove SOONG_CONFIG_art_module_source_build fallback"

core/android_soong_config_vars.mk

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 77260e6..99acdab 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -59,12 +59,6 @@
   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)))