commit 5c99382a1995723637814221cd5432c458c622ad
author Paul Duffin <paulduffin@google.com> Thu Nov 16 15:53:09 2017 +0000
committer Paul Duffin <paulduffin@google.com> Tue Nov 28 15:42:05 2017 +0000
tree 150cf4f91801e1798fc6e97936fd8f22d9923e22
parent 178dfc661de3c0c19502a615c44f9695204c552f

Added new android.test.base targets

Renames ...-legacy-test-... targets related to stubs generation to
...-android-test-base-....

Bug: 30188076
Test: make checkbuild
Change-Id: I54204733612d6d3f14dd8023973e993a5ddab51d

test-runner/Android.mk

diff --git a/test-runner/Android.mk b/test-runner/Android.mk
index c0fd7f8..87fe831 100644
--- a/test-runner/Android.mk
+++ b/test-runner/Android.mk
@@ -26,7 +26,7 @@
     core-oj \
     core-libart \
     framework \
-    legacy-test \
+    android.test.base \
     android.test.mock \
 
 LOCAL_MODULE:= android.test.runner
@@ -43,7 +43,7 @@
     core-oj \
     core-libart \
     framework \
-    legacy-test \
+    android.test.base \
     android.test.mock \
 
 LOCAL_JARJAR_RULES := $(LOCAL_PATH)/../test-base/jarjar-rules.txt
@@ -65,7 +65,7 @@
     core-oj \
     core-libart \
     framework \
-    legacy-test \
+    android.test.base \
     android.test.mock \
 
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
@@ -104,7 +104,7 @@
 LOCAL_MODULE := android.test.runner.stubs
 
 LOCAL_JAVA_LIBRARIES := \
-    legacy.test.stubs \
+    android.test.base.stubs \
     android.test.mock.stubs \
 
 LOCAL_SOURCE_FILES_ALL_GENERATED := true