Get rid of obsolete Make variable TARGET_CORE_JARS.
Test: aosp_walleye-userdebug boots.
Test: art/test/testrunner/testrunner.py --target --64
Test: art/tools/run-gtests.sh -j4
Test: art/test.py --host -r
Change-Id: Iab4d4c7f875773c0141688dc681b9abb37010264
diff --git a/Android.mk b/Android.mk
index 27f8ed5..d4de2e5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -750,7 +750,7 @@
########################################################################
# Phony target for building what go/lem requires for syncing /system to target.
.PHONY: build-art-unbundled-golem
-build-art-unbundled-golem: art-runtime linker oatdump $(TARGET_CORE_JARS) crash_dump
+build-art-unbundled-golem: art-runtime linker oatdump $(ART_APEX_JARS) conscrypt crash_dump
########################################################################
# Rules for building all dependencies for tests.
diff --git a/tools/build/var_cache.py b/tools/build/var_cache.py
index 9e616fa..abfc626 100644
--- a/tools/build/var_cache.py
+++ b/tools/build/var_cache.py
@@ -35,8 +35,7 @@
#
# For example, this would be a valid var-cache:
#
-# export ART_TOOLS_BUILD_VAR_CACHE="TARGET_CORE_JARS='core-oj core-libart'
-# HOST_CORE_JARS='core-oj-hostdex core-libart-hostdex'"
+# export ART_TOOLS_BUILD_VAR_CACHE="ART_APEX_JARS='core-oj core-libart'"
#
# Calling into soong repeatedly is very slow; whenever it needs to be done
# more than once, the var_cache.py or var_cache.sh script should be used instead.
@@ -119,8 +118,7 @@
_var_cache_dict = {}
# Parse $ART_TOOLS_BUILD_VAR_CACHE, e.g.
- # TARGET_CORE_JARS='core-oj core-libart conscrypt okhttp bouncycastle apache-xml'
- # HOST_CORE_JARS='core-oj-hostdex core-libart-hostdex ...'
+ # ART_APEX_JARS='core-oj core-libart conscrypt okhttp bouncycastle apache-xml'
for line in os.environ['ART_TOOLS_BUILD_VAR_CACHE'].splitlines():
_debug(line)
diff --git a/tools/build/var_cache.sh b/tools/build/var_cache.sh
index 26e9770..70835d7 100755
--- a/tools/build/var_cache.sh
+++ b/tools/build/var_cache.sh
@@ -37,8 +37,7 @@
#
# For example, this would be a valid var-cache:
#
-# export ART_TOOLS_BUILD_VAR_CACHE="TARGET_CORE_JARS='core-oj core-libart'
-# HOST_CORE_JARS='core-oj-hostdex core-libart-hostdex'"
+# export ART_TOOLS_BUILD_VAR_CACHE="ART_APEX_JARS='core-oj core-libart'"
#
# Calling into soong repeatedly is very slow; whenever it needs to be done
# more than once, the var_cache.py or var_cache.sh script should be used instead.
@@ -124,8 +123,7 @@
fi
# Parse $ART_TOOLS_BUILD_VAR_CACHE, e.g.
- # TARGET_CORE_JARS='core-oj core-libart conscrypt okhttp bouncycastle apache-xml'
- # HOST_CORE_JARS='core-oj-hostdex core-libart-hostdex ...'
+ # ART_APEX_JARS='core-oj core-libart conscrypt okhttp bouncycastle apache-xml'
local var_name
local var_value
diff --git a/tools/build/var_list b/tools/build/var_list
index 98a5472..3f2ccfc 100644
--- a/tools/build/var_list
+++ b/tools/build/var_list
@@ -20,10 +20,9 @@
#
# javac-helper.sh
-TARGET_CORE_JARS
+ART_APEX_JARS
PRODUCT_BOOT_JARS
TARGET_OUT_COMMON_INTERMEDIATES
-HOST_CORE_JARS
HOST_OUT_COMMON_INTERMEDIATES
# testrunner/env.py