diff options
Diffstat (limited to 'test-runner')
| -rw-r--r-- | test-runner/Android.bp | 24 | ||||
| -rw-r--r-- | test-runner/tests/Android.mk | 4 |
2 files changed, 20 insertions, 8 deletions
diff --git a/test-runner/Android.bp b/test-runner/Android.bp index 29d7ea9b5e80..b50ba3b58275 100644 --- a/test-runner/Android.bp +++ b/test-runner/Android.bp @@ -24,12 +24,11 @@ java_library { srcs: ["src/**/*.java"], errorprone: { - javacflags: ["-Xep:DepAnn:ERROR"], + javacflags: ["-Xep:DepAnn:ERROR"], }, - no_framework_libs: true, + sdk_version: "current", libs: [ - "framework", "android.test.base", "android.test.mock.stubs", ], @@ -44,9 +43,8 @@ java_library { srcs: ["src/android/**/*.java"], - no_framework_libs: true, + sdk_version: "current", libs: [ - "framework", "android.test.base", "android.test.mock.stubs", "junit", @@ -58,7 +56,21 @@ java_library { java_library_static { name: "repackaged.android.test.runner", - static_libs: ["android.test.runner"], + srcs: ["src/**/*.java"], + exclude_srcs: [ + "src/android/test/ActivityUnitTestCase.java", + "src/android/test/ApplicationTestCase.java", + "src/android/test/IsolatedContext.java", + "src/android/test/ProviderTestCase.java", + "src/android/test/ProviderTestCase2.java", + "src/android/test/RenamingDelegatingContext.java", + "src/android/test/ServiceTestCase.java", + ], + + sdk_version: "current", + libs: [ + "android.test.base", + ], jarjar_rules: "jarjar-rules.txt", // Pin java_version until jarjar is certified to support later versions. http://b/72703434 diff --git a/test-runner/tests/Android.mk b/test-runner/tests/Android.mk index 7b9e9a4a09e6..f97d1c986b1c 100644 --- a/test-runner/tests/Android.mk +++ b/test-runner/tests/Android.mk @@ -25,8 +25,8 @@ include $(CLEAR_VARS) # LOCAL_MODULE_TAGS := tests -LOCAL_JAVA_LIBRARIES := android.test.runner -LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test +LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base android.test.mock +LOCAL_STATIC_JAVA_LIBRARIES := junit # Include all test java files. LOCAL_SRC_FILES := $(call all-java-files-under, src) |