Move testapi API files for symmetry with others

The other non-updatable API files are in core/api/*. Also add
-non-updatable to the module to match the others.

Bug: 171029603
Test: m checkapi
Change-Id: I2bd1fa5bac6b35096b3059f93d68ef24b7a464e5
Merged-In: I2bd1fa5bac6b35096b3059f93d68ef24b7a464e5
(cherry picked from commit 3a1b1bd620454dd1d5b328c98634a567865cd55e)
This commit is contained in:
Anton Hansson
2020-11-05 10:45:13 +00:00
parent 97f35bbbef
commit 552ba2c492
4 changed files with 5 additions and 5 deletions

View File

@@ -225,7 +225,7 @@ droidstubs {
}
droidstubs {
name: "test-api-stubs-docs",
name: "test-api-stubs-docs-non-updatable",
defaults: ["metalava-non-updatable-api-stubs-default"],
arg_files: [
"core/res/AndroidManifest.xml",
@@ -237,12 +237,12 @@ droidstubs {
+ "\\)",
check_api: {
current: {
api_file: "api/test-current.txt",
removed_api_file: "api/test-removed.txt",
api_file: "core/api/test-current.txt",
removed_api_file: "core/api/test-removed.txt",
},
api_lint: {
enabled: true,
baseline_file: "api/test-lint-baseline.txt",
baseline_file: "core/api/test-lint-baseline.txt",
},
},
dist: {
@@ -361,7 +361,7 @@ java_library_static {
java_library_static {
name: "android_test_stubs_current",
srcs: [ ":test-api-stubs-docs" ],
srcs: [ ":test-api-stubs-docs-non-updatable" ],
static_libs: [
// Modules do not have test APIs, but we want to include their SystemApis, like we include
// the SystemApi of framework-non-updatable-sources.