diff options
| author | Anton Hansson <hansson@google.com> | 2021-05-11 10:49:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-11 10:49:42 +0000 |
| commit | 160d104df9f245c59ff99ab5335c7c5bda4c82b3 (patch) | |
| tree | a32abbfedadf0805dbf1cef0589dcd4b271379ec | |
| parent | 98994935c127dd739aba993526910e8d9b04ac9b (diff) | |
| parent | 4eecbfcd412447cbcad1315e42e2a1034334f408 (diff) | |
Merge "Use filegroups for test-{base,mock,runner} srcs" am: af9b5f0a04 am: 06e56695cc am: 4eecbfcd41
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700026
Change-Id: I5444e5d1028c8cf9cd3fa624e05ad5b102866d94
| -rw-r--r-- | ApiDocs.bp | 6 | ||||
| -rw-r--r-- | test-base/Android.bp | 10 | ||||
| -rw-r--r-- | test-mock/Android.bp | 8 | ||||
| -rw-r--r-- | test-runner/Android.bp | 10 |
4 files changed, 26 insertions, 8 deletions
diff --git a/ApiDocs.bp b/ApiDocs.bp index 0f218b581bbd..74dd78f9ae96 100644 --- a/ApiDocs.bp +++ b/ApiDocs.bp @@ -93,9 +93,9 @@ stubs_defaults { ":updatable-media-srcs", // No longer part of the stubs, but are included in the docs. - "test-base/src/**/*.java", - "test-mock/src/**/*.java", - "test-runner/src/**/*.java", + ":android-test-base-sources", + ":android-test-mock-sources", + ":android-test-runner-sources", ], libs: framework_docs_only_libs, create_doc_stubs: true, diff --git a/test-base/Android.bp b/test-base/Android.bp index 9bd639b63ae0..b58aa11597c2 100644 --- a/test-base/Android.bp +++ b/test-base/Android.bp @@ -32,7 +32,7 @@ package { java_sdk_library { name: "android.test.base", - srcs: ["src/**/*.java"], + srcs: [":android-test-base-sources"], errorprone: { javacflags: ["-Xep:DepAnn:ERROR"], @@ -66,7 +66,7 @@ java_library_static { name: "android.test.base_static", installable: false, - srcs: ["src/**/*.java"], + srcs: [":android-test-base-sources"], errorprone: { javacflags: ["-Xep:DepAnn:ERROR"], @@ -114,6 +114,12 @@ java_library_static { ], } +filegroup { + name: "android-test-base-sources", + srcs: ["src/**/*.java"], + path: "src", +} + // Make the current.txt available for use by the cts/tests/signature tests. // ======================================================================== filegroup { diff --git a/test-mock/Android.bp b/test-mock/Android.bp index b83bce654a85..107292c81ab4 100644 --- a/test-mock/Android.bp +++ b/test-mock/Android.bp @@ -29,7 +29,7 @@ java_sdk_library { name: "android.test.mock", srcs: [ - "src/**/*.java", + ":android-test-mock-sources", // Note: Below are NOT APIs of this library. We only take APIs under // the android.test.mock package. They however provide private APIs that // android.test.mock APIs references to. @@ -61,3 +61,9 @@ filegroup { "api/current.txt", ], } + +filegroup { + name: "android-test-mock-sources", + srcs: ["src/**/*.java"], + path: "src", +} diff --git a/test-runner/Android.bp b/test-runner/Android.bp index fe007e39f717..c380ae3a243b 100644 --- a/test-runner/Android.bp +++ b/test-runner/Android.bp @@ -29,7 +29,7 @@ package { java_sdk_library { name: "android.test.runner", - srcs: ["src/**/*.java"], + srcs: [":android-test-runner-sources"], errorprone: { javacflags: ["-Xep:DepAnn:ERROR"], @@ -76,7 +76,7 @@ java_library { java_library_static { name: "repackaged.android.test.runner", - srcs: ["src/**/*.java"], + srcs: [":android-test-runner-sources"], exclude_srcs: [ "src/android/test/ActivityUnitTestCase.java", "src/android/test/ApplicationTestCase.java", @@ -108,3 +108,9 @@ filegroup { "api/current.txt", ], } + +filegroup { + name: "android-test-runner-sources", + srcs: ["src/**/*.java"], + path: "src", +} |