diff options
| -rw-r--r-- | test-mock/Android.bp | 13 | ||||
| -rw-r--r-- | test-runner/Android.bp | 17 |
2 files changed, 15 insertions, 15 deletions
diff --git a/test-mock/Android.bp b/test-mock/Android.bp index 54e07a1673e7..bb0736334f87 100644 --- a/test-mock/Android.bp +++ b/test-mock/Android.bp @@ -19,7 +19,6 @@ java_library { name: "android.test.mock", - // Needs to be consistent with the repackaged version of this make target. java_version: "1.8", srcs: ["src/**/*.java"], @@ -28,15 +27,3 @@ java_library { "framework", ], } - -// Build the repackaged.android.test.mock library -// ============================================== -java_library_static { - name: "repackaged.android.test.mock", - - static_libs: ["android.test.mock"], - - jarjar_rules: "jarjar-rules.txt", - // Pin java_version until jarjar is certified to support later versions. http://b/72703434 - java_version: "1.8", -} diff --git a/test-runner/Android.bp b/test-runner/Android.bp index c69279b76e48..1cce2c3cc32c 100644 --- a/test-runner/Android.bp +++ b/test-runner/Android.bp @@ -24,7 +24,7 @@ java_library { srcs: ["src/**/*.java"], errorprone: { - javacflags: ["-Xep:DepAnn:ERROR"], + javacflags: ["-Xep:DepAnn:ERROR"], }, sdk_version: "current", @@ -56,8 +56,21 @@ java_library { java_library_static { name: "repackaged.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", - static_libs: ["android.test.runner"], + libs: [ + "android.test.base", + ], jarjar_rules: "jarjar-rules.txt", // Pin java_version until jarjar is certified to support later versions. http://b/72703434 |