Introduce Make variables for the various Runtime APEX names.
Test: make systemimage (with user lunch target)
Test: make systemimage (with userdebug/eng lunch target)
Test: art/build/apex/runtests.sh
Bug: 129534335
Change-Id: I69a06acc777acba17deb5e32061d1099ae82beaf
diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk
index 625444f..b0bd7fd 100644
--- a/build/Android.common_path.mk
+++ b/build/Android.common_path.mk
@@ -147,4 +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.runtime.release
+# Debug Runtime APEX, included by default in "userdebug" and "eng"
+# builds and used in ART device testing and benchmarking.
+DEBUG_RUNTIME_APEX := com.android.runtime.debug
+# Testing Runtime APEX (not used yet).
+TESTING_RUNTIME_APEX := com.android.runtime.testing
+
endif # ART_ANDROID_COMMON_PATH_MK
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index ff0f891..0c64733 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) \
- com.android.runtime.debug # For dexoptanalyzerd.
+ $(DEBUG_RUNTIME_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) \
- com.android.runtime.debug # For dex2oatd.
+ $(DEBUG_RUNTIME_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) \
- com.android.runtime.debug # For dex2oatd.
+ $(DEBUG_RUNTIME_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 := com.android.runtime.debug # For dexdiag.
+ART_GTEST_dexdiag_test_TARGET_DEPS := $(DEBUG_RUNTIME_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) \
- com.android.runtime.debug # For dexlist.
+ $(DEBUG_RUNTIME_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) \
- com.android.runtime.debug # For oatdumpd, dexdump, dex2oatd.
+ $(DEBUG_RUNTIME_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 := com.android.runtime.debug # For profmand.
+ART_GTEST_profile_assistant_test_TARGET_DEPS := $(DEBUG_RUNTIME_APEX) # For profmand.
ART_GTEST_hiddenapi_test_HOST_DEPS := \
$(HOST_CORE_IMAGE_DEFAULT_64) \