summaryrefslogtreecommitdiff
path: root/test-runner
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2017-11-16 15:53:09 +0000
committerPaul Duffin <paulduffin@google.com>2018-01-12 16:31:08 +0000
commite95a895ef416822bbdefa2302ba6ba362a352f9f (patch)
tree4de7a567af628408e42388c7b41921e72af8cc1d /test-runner
parent21418277009ee848e095b35903d7fde213d3d5fe (diff)
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
Diffstat (limited to 'test-runner')
-rw-r--r--test-runner/Android.bp2
-rw-r--r--test-runner/Android.mk4
2 files changed, 3 insertions, 3 deletions
diff --git a/test-runner/Android.bp b/test-runner/Android.bp
index 104ae8236368..cddfef864324 100644
--- a/test-runner/Android.bp
+++ b/test-runner/Android.bp
@@ -24,7 +24,7 @@ java_library {
no_framework_libs: true,
libs: [
"framework",
- "legacy-test",
+ "android.test.base",
"android.test.mock",
],
}
diff --git a/test-runner/Android.mk b/test-runner/Android.mk
index 6cf2d5646ffb..cdc7756d5754 100644
--- a/test-runner/Android.mk
+++ b/test-runner/Android.mk
@@ -26,7 +26,7 @@ LOCAL_JAVA_LIBRARIES := \
core-oj \
core-libart \
framework \
- legacy-test \
+ android.test.base \
android.test.mock \
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
@@ -65,7 +65,7 @@ include $(CLEAR_VARS)
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