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
This commit is contained in:
Anton Hansson
2020-11-05 10:45:13 +00:00
parent 65aa6ea9d1
commit 022aac54d2
5 changed files with 6 additions and 6 deletions

View File

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

View File

@@ -19,7 +19,7 @@ package {
genrule { genrule {
name: "current-api-xml", name: "current-api-xml",
tools: ["metalava"], tools: ["metalava"],
srcs: ["current.txt"], srcs: [":frameworks-base-api-current.txt"],
out: ["current.api"], out: ["current.api"],
cmd: "$(location metalava) --no-banner -convert2xmlnostrip $(in) $(out)", cmd: "$(location metalava) --no-banner -convert2xmlnostrip $(in) $(out)",
visibility: ["//visibility:public"], visibility: ["//visibility:public"],