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
diff --git a/StubLibraries.bp b/StubLibraries.bp
index 6e3fe50..8fca23f 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -230,7 +230,7 @@
}
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",
@@ -242,12 +242,12 @@
+ "\\)",
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: {
@@ -370,7 +370,7 @@
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.
diff --git a/api/Android.bp b/api/Android.bp
index 28b7594..a5def69 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -19,7 +19,7 @@
genrule {
name: "current-api-xml",
tools: ["metalava"],
- srcs: ["current.txt"],
+ srcs: [":frameworks-base-api-current.txt"],
out: ["current.api"],
cmd: "$(location metalava) --no-banner -convert2xmlnostrip $(in) $(out)",
visibility: ["//visibility:public"],
diff --git a/api/test-current.txt b/core/api/test-current.txt
similarity index 100%
rename from api/test-current.txt
rename to core/api/test-current.txt
diff --git a/api/test-lint-baseline.txt b/core/api/test-lint-baseline.txt
similarity index 100%
rename from api/test-lint-baseline.txt
rename to core/api/test-lint-baseline.txt
diff --git a/api/test-removed.txt b/core/api/test-removed.txt
similarity index 100%
rename from api/test-removed.txt
rename to core/api/test-removed.txt