drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use filegroups for test-{base,mock,runner} srcs" am: af9b5f0a04 am: 06e56695cc am: 4eecbfcd41

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700026

Change-Id: I5444e5d1028c8cf9cd3fa624e05ad5b102866d94
This commit is contained in:
Anton Hansson 2021-05-11 10:49:42 +00:00 committed by Automerger Merge Worker
commit 160d104df9
4 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApiDocs.bp
View File

@ -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,

10
test-base/Android.bp
View File

@ -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 {

8
test-mock/Android.bp
View File

@ -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",
}

10
test-runner/Android.bp
View File

@ -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",
}