summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Android.bp4
-rw-r--r--core/res/Android.bp9
2 files changed, 11 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index 0c9b82e5990e..e426b71c56c2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -506,7 +506,7 @@ metalava_framework_docs_args = "" +
"--hide Todo " +
"--hide Typo " +
"--hide UnavailableSymbol " +
- "--manifest $(location core/res/AndroidManifest.xml) "
+ "--manifest $(location :frameworks-base-core-AndroidManifest.xml) "
packages_to_document = [
"android",
@@ -543,7 +543,7 @@ stubs_defaults {
sdk_version: "none",
system_modules: "none",
java_version: "1.8",
- arg_files: ["core/res/AndroidManifest.xml"],
+ arg_files: [":frameworks-base-core-AndroidManifest.xml"],
aidl: {
local_include_dirs: [
"media/aidl",
diff --git a/core/res/Android.bp b/core/res/Android.bp
index 93ce7832824b..42c95d6cfd58 100644
--- a/core/res/Android.bp
+++ b/core/res/Android.bp
@@ -172,3 +172,12 @@ genrule {
" > $(out)",
tools: ["xmllint"],
}
+
+filegroup {
+ name: "frameworks-base-core-AndroidManifest.xml",
+ srcs: ["AndroidManifest.xml"],
+ visibility: [
+ "//frameworks/base",
+ "//frameworks/base/api",
+ ],
+}