commit ec64f202c6ab6dd825cd5bb9dd98a0fb37570dba
author Nicolas Geoffray <ngeoffray@google.com> Mon Apr 20 15:05:54 2020 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Tue Apr 28 17:56:59 2020 +0000
tree 38713c0a692ca1382bec604e9fb0b1ee7ad3525e
parent 9c674ca2a44bd0e0d1ce3fee29320938847a8caf

Cleanup build rules for faster golem builds.

Bug: 149682808
Test: m build-art-target-golem
Change-Id: Ie6da8dd5aae7fa19f9a5ef1dd6b2f0038bd8467a

build/Android.gtest.mk

diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index f5c9892..910d7f9 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -282,7 +282,7 @@
   $(HOST_OUT_EXECUTABLES)/dex2oatd
 ART_GTEST_oat_file_test_TARGET_DEPS := \
   $(ART_GTEST_dex2oat_environment_tests_TARGET_DEPS) \
-  dex2oatd.com.android.art.debug
+  dex2oatd.com.android.art.testing
 
 ART_GTEST_oat_file_assistant_test_HOST_DEPS := \
   $(ART_GTEST_dex2oat_environment_tests_HOST_DEPS)
@@ -336,7 +336,7 @@
 ART_GTEST_dexdump_test_TARGET_DEPS := \
   $(TARGET_CORE_IMAGE_DEFAULT_64) \
   $(TARGET_CORE_IMAGE_DEFAULT_32) \
-  dexdump.com.android.art.debug
+  dexdump.com.android.art.testing
 
 # The dexanalyze test requires an image and the dexanalyze utility.
 ART_GTEST_dexanalyze_test_HOST_DEPS := \
@@ -346,7 +346,7 @@
 ART_GTEST_dexanalyze_test_TARGET_DEPS := \
   $(TARGET_CORE_IMAGE_DEFAULT_64) \
   $(TARGET_CORE_IMAGE_DEFAULT_32) \
-  dexanalyze.com.android.art.debug
+  dexanalyze.com.android.art.testing
 
 # The dexlayout test requires an image and the dexlayout utility.
 # TODO: rename into dexdump when migration completes
@@ -358,8 +358,8 @@
 ART_GTEST_dexlayout_test_TARGET_DEPS := \
   $(TARGET_CORE_IMAGE_DEFAULT_64) \
   $(TARGET_CORE_IMAGE_DEFAULT_32) \
-  dexlayoutd.com.android.art.debug \
-  dexdump.com.android.art.debug
+  dexlayoutd.com.android.art.testing \
+  dexdump.com.android.art.testing
 
 # The dexlist test requires an image and the dexlist utility.
 ART_GTEST_dexlist_test_HOST_DEPS := \
@@ -381,13 +381,13 @@
 ART_GTEST_imgdiag_test_TARGET_DEPS := \
   $(TARGET_CORE_IMAGE_DEFAULT_64) \
   $(TARGET_CORE_IMAGE_DEFAULT_32) \
-  imgdiagd.com.android.art.debug
+  imgdiagd.com.android.art.testing
 
 # Dex analyze test requires dexanalyze.
 ART_GTEST_dexanalyze_test_HOST_DEPS := \
   $(HOST_OUT_EXECUTABLES)/dexanalyze
 ART_GTEST_dexanalyze_test_TARGET_DEPS := \
-  dexanalyze.com.android.art.debug
+  dexanalyze.com.android.art.testing
 
 # Oatdump test requires an image and oatfile to dump.
 ART_GTEST_oatdump_test_HOST_DEPS := \
@@ -628,9 +628,9 @@
 ifeq ($(ART_BUILD_TARGET),true)
   $(foreach name,$(ART_TARGET_GTEST_NAMES), $(eval $(call add-art-gtest-dependencies,$(name),)))
   ART_TEST_TARGET_GTEST_DEPENDENCIES += \
-    libicu_jni.com.android.art.debug \
-    libjavacore.com.android.art.debug \
-    libopenjdkd.com.android.art.debug \
+    libicu_jni.com.android.art.testing \
+    libjavacore.com.android.art.testing \
+    libopenjdkd.com.android.art.testing \
     com.android.art.testing \
     com.android.conscrypt
 endif