aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2021-07-07 03:22:17 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-07-07 03:22:17 +0000
commite4f1db4cccef1dc1b3e880495b9f931c1b446ae8 (patch)
tree3a7c2389506caafb4b1216db00ce4d6108356c61
parent343555dafd305ef13e7f2780d574bbc681295fb3 (diff)
parent7e2e4be86c9f32f6bd93fbc9e1489a970f9cdd88 (diff)
downloadbuild-e4f1db4cccef1dc1b3e880495b9f931c1b446ae8.tar.gz
Merge changes from topic "revert-15071196-init_first_stage_soong-GBJXQRPEKC" into sc-dev am: 7e2e4be86c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15167736 Change-Id: I985ee7be784ce1d52b502bcc12d25e1b4ffb8b1f
-rw-r--r--core/android_soong_config_vars.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 944d862beb..43d1aada94 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -28,7 +28,6 @@ $(call add_soong_config_namespace,ANDROID)
$(call add_soong_config_var,ANDROID,TARGET_ENABLE_MEDIADRM_64)
$(call add_soong_config_var,ANDROID,BOARD_USES_ODMIMAGE)
-$(call add_soong_config_var,ANDROID,BOARD_BUILD_SYSTEM_ROOT_IMAGE)
# TODO(b/172480615): Remove when platform uses ART Module prebuilts by default.
ifeq (,$(filter art_module,$(SOONG_CONFIG_NAMESPACES)))