Merge "Use a filegroup for the AndroidManifest.xml input" am: 7ebe6c53 am:...

Merge "Use a filegroup for the AndroidManifest.xml input" am: 7ebe6c53 am: adf08825 am: d8c406bc

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



Change-Id: I953bb248286b748699c95fa72d789db630b3d256
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

@@ -580,7 +580,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",
@@ -617,7 +617,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",

core/res/Android.bp

@@ -178,3 +178,12 @@ genrule {
         " > $(out)",
     tools: ["xmllint"],
 }
+
+filegroup {
+    name: "frameworks-base-core-AndroidManifest.xml",
+    srcs: ["AndroidManifest.xml"],
+    visibility: [
+        "//frameworks/base",
+        "//frameworks/base/api",
+    ],
+}