Rename some build variables and targets for the ART APEX.
Test: m
Bug: 135753770
Change-Id: I66273981013710500e5e57c0a3c40a5fdc61e3d0
diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk
index 4251a2e..9c8a45d 100644
--- a/build/Android.common_path.mk
+++ b/build/Android.common_path.mk
@@ -147,12 +147,12 @@
ART_HOST_EXECUTABLES += $(foreach name,$(ART_CORE_DEBUGGABLE_EXECUTABLES),$(name)d-host)
endif
-# Release Runtime APEX, included by default in "user" builds.
-RELEASE_RUNTIME_APEX := com.android.art.release
-# Debug Runtime APEX, included by default in "userdebug" and "eng"
+# Release ART APEX, included by default in "user" builds.
+RELEASE_ART_APEX := com.android.art.release
+# Debug ART APEX, included by default in "userdebug" and "eng"
# builds and used in ART device benchmarking.
-DEBUG_RUNTIME_APEX := com.android.art.debug
-# Testing Runtime APEX, used in ART device testing.
-TESTING_RUNTIME_APEX := com.android.art.testing
+DEBUG_ART_APEX := com.android.art.debug
+# Testing ART APEX, used in ART device testing.
+TESTING_ART_APEX := com.android.art.testing
endif # ART_ANDROID_COMMON_PATH_MK
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 5bd1a85..736b7f3 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -286,7 +286,7 @@
$(HOST_OUT_EXECUTABLES)/dexoptanalyzerd
ART_GTEST_dexoptanalyzer_test_TARGET_DEPS := \
$(ART_GTEST_dex2oat_environment_tests_TARGET_DEPS) \
- $(TESTING_RUNTIME_APEX) # For dexoptanalyzerd.
+ $(TESTING_ART_APEX) # For dexoptanalyzerd.
ART_GTEST_image_space_test_HOST_DEPS := \
$(ART_GTEST_dex2oat_environment_tests_HOST_DEPS)
@@ -298,21 +298,21 @@
$(HOST_OUT_EXECUTABLES)/dex2oatd
ART_GTEST_dex2oat_test_TARGET_DEPS := \
$(ART_GTEST_dex2oat_environment_tests_TARGET_DEPS) \
- $(TESTING_RUNTIME_APEX) # For dex2oatd.
+ $(TESTING_ART_APEX) # For dex2oatd.
ART_GTEST_dex2oat_image_test_HOST_DEPS := \
$(ART_GTEST_dex2oat_environment_tests_HOST_DEPS) \
$(HOST_OUT_EXECUTABLES)/dex2oatd
ART_GTEST_dex2oat_image_test_TARGET_DEPS := \
$(ART_GTEST_dex2oat_environment_tests_TARGET_DEPS) \
- $(TESTING_RUNTIME_APEX) # For dex2oatd.
+ $(TESTING_ART_APEX) # For dex2oatd.
# TODO: document why this is needed.
ART_GTEST_proxy_test_HOST_DEPS := $(HOST_CORE_IMAGE_DEFAULT_64) $(HOST_CORE_IMAGE_DEFAULT_32)
# The dexdiag test requires the dexdiag utility.
ART_GTEST_dexdiag_test_HOST_DEPS := $(HOST_OUT_EXECUTABLES)/dexdiag
-ART_GTEST_dexdiag_test_TARGET_DEPS := $(TESTING_RUNTIME_APEX) # For dexdiag.
+ART_GTEST_dexdiag_test_TARGET_DEPS := $(TESTING_ART_APEX) # For dexdiag.
# The dexdump test requires an image and the dexdump utility.
# TODO: rename into dexdump when migration completes
@@ -356,7 +356,7 @@
ART_GTEST_dexlist_test_TARGET_DEPS := \
$(TARGET_CORE_IMAGE_DEFAULT_64) \
$(TARGET_CORE_IMAGE_DEFAULT_32) \
- $(TESTING_RUNTIME_APEX) # For dexlist.
+ $(TESTING_ART_APEX) # For dexlist.
# The imgdiag test has dependencies on core.oat since it needs to load it during the test.
# For the host, also add the installed tool (in the base size, that should suffice). For the
@@ -388,7 +388,7 @@
ART_GTEST_oatdump_test_TARGET_DEPS := \
$(TARGET_CORE_IMAGE_DEFAULT_64) \
$(TARGET_CORE_IMAGE_DEFAULT_32) \
- $(TESTING_RUNTIME_APEX) # For oatdumpd, dexdump, dex2oatd.
+ $(TESTING_ART_APEX) # For oatdumpd, dexdump, dex2oatd.
ART_GTEST_oatdump_image_test_HOST_DEPS := $(ART_GTEST_oatdump_test_HOST_DEPS)
ART_GTEST_oatdump_image_test_TARGET_DEPS := $(ART_GTEST_oatdump_test_TARGET_DEPS)
ART_GTEST_oatdump_app_test_HOST_DEPS := $(ART_GTEST_oatdump_test_HOST_DEPS)
@@ -396,7 +396,7 @@
# Profile assistant tests requires profman utility.
ART_GTEST_profile_assistant_test_HOST_DEPS := $(HOST_OUT_EXECUTABLES)/profmand
-ART_GTEST_profile_assistant_test_TARGET_DEPS := $(TESTING_RUNTIME_APEX) # For profmand.
+ART_GTEST_profile_assistant_test_TARGET_DEPS := $(TESTING_ART_APEX) # For profmand.
ART_GTEST_hiddenapi_test_HOST_DEPS := \
$(HOST_CORE_IMAGE_DEFAULT_64) \
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 8c93349..d5bd69d 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -16,7 +16,7 @@
// installed in `/system` for the ART Buildbot set-up to work properly. This is
// done by the `standalone-apex-files` Make phony target, used by the ART
// Buildbot and Golem (see `art/Android.mk`). If you add libraries to this list,
-// you may have to also add them to `PRIVATE_RUNTIME_DEPENDENCY_LIBS` in
+// you may have to also add them to `PRIVATE_ART_APEX_DEPENDENCY_LIBS` in
// `art/Android.mk`.
// TODO(b/121117762): Remove this note when both the ART Buildbot and Golem use
// the ART APEX.
@@ -152,7 +152,7 @@
// installed in `/system` for the ART Buildbot set-up to work properly. This is
// done by the `standalone-apex-files` Make phony target, used by the ART
// Buildbot and Golem (see `art/Android.mk`). If you add libraries to this list,
-// you may have to also add them to `PRIVATE_RUNTIME_DEPENDENCY_LIBS` in
+// you may have to also add them to `PRIVATE_ART_APEX_DEPENDENCY_LIBS` in
// `art/Android.mk`.
// TODO(b/121117762): Remove this note when both the ART Buildbot and Golem use
// the ART APEX.