Rename some build variables and targets for the ART APEX. am: 84e5bb990d am: e224b212a0

am: 6b0b07767e

Change-Id: I076ca5356512b40aeec21f4241af7d33b0daa5fe

5 files changed, 35 insertions, 35 deletions

diff --git a/Android.mk b/Android.mk
index 21dc33c498..64d72c1d9c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -345,16 +345,16 @@ endif
 ifeq (true,$(art_target_include_debug_build))
   # Module with both release and debug variants, as well as
   # additional tools.
-  TARGET_RUNTIME_APEX := $(DEBUG_RUNTIME_APEX)
+  TARGET_ART_APEX := $(DEBUG_ART_APEX)
   APEX_TEST_MODULE := art-check-debug-apex-gen-fakebin
 else
   # Release module (without debug variants nor tools).
-  TARGET_RUNTIME_APEX := $(RELEASE_RUNTIME_APEX)
+  TARGET_ART_APEX := $(RELEASE_ART_APEX)
   APEX_TEST_MODULE := art-check-release-apex-gen-fakebin
 endif
 
 LOCAL_MODULE := com.android.art
-LOCAL_REQUIRED_MODULES := $(TARGET_RUNTIME_APEX)
+LOCAL_REQUIRED_MODULES := $(TARGET_ART_APEX)
 LOCAL_REQUIRED_MODULES += art_apex_boot_integrity
 
 # Clear locally used variable.
@@ -372,11 +372,11 @@ include $(BUILD_PHONY_PACKAGE)
 
 # Create canonical name -> file name symlink in the symbol directory
 # The symbol files for the debug or release variant are installed to
-# $(TARGET_OUT_UNSTRIPPED)/$(TARGET_RUNTIME_APEX) directory. However,
+# $(TARGET_OUT_UNSTRIPPED)/$(TARGET_ART_APEX) directory. However,
 # since they are available via /apex/com.android.art at runtime
 # regardless of which variant is installed, create a symlink so that
 # $(TARGET_OUT_UNSTRIPPED)/apex/com.android.art is linked to
-# $(TARGET_OUT_UNSTRIPPED)/apex/$(TARGET_RUNTIME_APEX).
+# $(TARGET_OUT_UNSTRIPPED)/apex/$(TARGET_ART_APEX).
 # Note that installation of the symlink is triggered by the apex_manifest.json
 # file which is the file that is guaranteed to be created regardless of the
 # value of TARGET_FLATTEN_APEX.
@@ -388,23 +388,23 @@ include $(BUILD_PHONY_PACKAGE)
 # directory so that the APEX is accessible via the canonical path
 # /apex/com.android.art
 ifeq ($(TARGET_FLATTEN_APEX),true)
-runtime_apex_manifest_file := $(PRODUCT_OUT)/system/apex/$(TARGET_RUNTIME_APEX)/apex_manifest.json
+art_apex_manifest_file := $(PRODUCT_OUT)/system/apex/$(TARGET_ART_APEX)/apex_manifest.json
 else
-runtime_apex_manifest_file := $(PRODUCT_OUT)/apex/$(TARGET_RUNTIME_APEX)/apex_manifest.json
+art_apex_manifest_file := $(PRODUCT_OUT)/apex/$(TARGET_ART_APEX)/apex_manifest.json
 endif
 
-runtime_apex_symlink_timestamp := $(call intermediates-dir-for,FAKE,com.android.art)/symlink.timestamp
-$(runtime_apex_manifest_file): $(runtime_apex_symlink_timestamp)
-$(runtime_apex_manifest_file): PRIVATE_LINK_NAME := $(TARGET_OUT_UNSTRIPPED)/apex/com.android.art
-$(runtime_apex_symlink_timestamp):
+art_apex_symlink_timestamp := $(call intermediates-dir-for,FAKE,com.android.art)/symlink.timestamp
+$(art_apex_manifest_file): $(art_apex_symlink_timestamp)
+$(art_apex_manifest_file): PRIVATE_LINK_NAME := $(TARGET_OUT_UNSTRIPPED)/apex/com.android.art
+$(art_apex_symlink_timestamp):
 	$(hide) mkdir -p $(dir $(PRIVATE_LINK_NAME))
-	$(hide) ln -sf $(TARGET_RUNTIME_APEX) $(PRIVATE_LINK_NAME)
+	$(hide) ln -sf $(TARGET_ART_APEX) $(PRIVATE_LINK_NAME)
 ifeq ($(TARGET_FLATTEN_APEX),true)
 	$(hide) mkdir -p $(TARGET_OUT)/apex/com.android.art
 endif
 	$(hide) touch $@
 
-runtime_apex_manifest_file :=
+art_apex_manifest_file :=
 
 #######################
 # Fake packages for ART
@@ -535,7 +535,7 @@ PRIVATE_BIONIC_FILES := \
   lib64/bootstrap/libm.so \
   lib64/bootstrap/libdl.so \
 
-PRIVATE_RUNTIME_DEPENDENCY_LIBS := \
+PRIVATE_ART_APEX_DEPENDENCY_LIBS := \
   lib/libnativebridge.so \
   lib64/libnativebridge.so \
   lib/libnativehelper.so \
@@ -574,18 +574,18 @@ PRIVATE_RUNTIME_DEPENDENCY_LIBS := \
 # TODO(b/129332183): Remove this when Golem has full support for the
 # ART APEX.
 .PHONY: standalone-apex-files
-standalone-apex-files: libc.bootstrap libdl.bootstrap libm.bootstrap linker $(DEBUG_RUNTIME_APEX)
+standalone-apex-files: libc.bootstrap libdl.bootstrap libm.bootstrap linker $(DEBUG_ART_APEX)
 	for f in $(PRIVATE_BIONIC_FILES); do \
 	  tf=$(TARGET_OUT)/$$f; \
 	  if [ -f $$tf ]; then cp -f $$tf $$(echo $$tf | sed 's,bootstrap/,,'); fi; \
 	done
 	if [ "x$(TARGET_FLATTEN_APEX)" = xtrue ]; then \
-	  runtime_apex_orig_dir=$(TARGET_OUT)/apex/$(DEBUG_RUNTIME_APEX); \
+	  art_apex_orig_dir=$(TARGET_OUT)/apex/$(DEBUG_ART_APEX); \
 	else \
-	  runtime_apex_orig_dir=$(TARGET_OUT)/../apex/$(DEBUG_RUNTIME_APEX); \
+	  art_apex_orig_dir=$(TARGET_OUT)/../apex/$(DEBUG_ART_APEX); \
 	fi; \
-	for f in $(PRIVATE_RUNTIME_DEPENDENCY_LIBS); do \
-	  tf="$$runtime_apex_orig_dir/$$f"; \
+	for f in $(PRIVATE_ART_APEX_DEPENDENCY_LIBS); do \
+	  tf="$$art_apex_orig_dir/$$f"; \
 	  if [ -f $$tf ]; then cp -f $$tf $(TARGET_OUT)/$$f; fi; \
 	done
 
diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk
index 4251a2e471..9c8a45d23c 100644
--- a/build/Android.common_path.mk
+++ b/build/Android.common_path.mk
@@ -147,12 +147,12 @@ ifneq ($(ART_BUILD_HOST_DEBUG),false)
 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 5bd1a85a23..736b7f3af5 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -286,7 +286,7 @@ ART_GTEST_dexoptanalyzer_test_HOST_DEPS := \
   $(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 @@ ART_GTEST_dex2oat_test_HOST_DEPS := \
   $(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_HOST_DEPS := \
 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_HOST_DEPS := \
 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 @@ ART_GTEST_oatdump_app_test_TARGET_DEPS := $(ART_GTEST_oatdump_test_TARGET_DEPS)
 
 # 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 8c933490c9..d5bd69d720 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -16,7 +16,7 @@ art_runtime_base_binaries_prefer32 = [
 // 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 @@ libcore_java_libs = [
 // 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.
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 5fd1e5b53c..bdbfe299c3 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -30,7 +30,7 @@ TEST_ART_RUN_TEST_DEPENDENCIES := \
 # and Debug APEXes) -- which contains dex2oat, dalvikvm, their
 # dependencies and ART gtests -- on the target, as well as the core
 # images (all images as we sync only once).
-ART_TEST_TARGET_RUN_TEST_DEPENDENCIES := $(TESTING_RUNTIME_APEX) $(TARGET_CORE_IMG_OUTS)
+ART_TEST_TARGET_RUN_TEST_DEPENDENCIES := $(TESTING_ART_APEX) $(TARGET_CORE_IMG_OUTS)
 
 # Also need libartagent.
 ART_TEST_TARGET_RUN_TEST_DEPENDENCIES += libartagent-target libartagentd-target