commit e95a895ef416822bbdefa2302ba6ba362a352f9f
author Paul Duffin <paulduffin@google.com> Thu Nov 16 15:53:09 2017 +0000
committer Paul Duffin <paulduffin@google.com> Fri Jan 12 16:31:08 2018 +0000
tree 4de7a567af628408e42388c7b41921e72af8cc1d
parent 21418277009ee848e095b35903d7fde213d3d5fe

Added new android.test.base targets

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

(cherry picked from commit 5c99382a1995723637814221cd5432c458c622ad)

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

test-runner/Android.bp

diff --git a/test-runner/Android.bp b/test-runner/Android.bp
index 104ae82..cddfef8 100644
--- a/test-runner/Android.bp
+++ b/test-runner/Android.bp
@@ -24,7 +24,7 @@
     no_framework_libs: true,
     libs: [
         "framework",
-        "legacy-test",
+        "android.test.base",
         "android.test.mock",
     ],
 }

test-runner/Android.mk

diff --git a/test-runner/Android.mk b/test-runner/Android.mk
index 6cf2d56..cdc7756 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_CLASS := JAVA_LIBRARIES
@@ -65,7 +65,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