diff --git a/Android.bp b/Android.bp
index 67902b310481d7ba7f6b4ddc62eb0301ad170772..62d2632a8af697639ab3f6f787eecde885715d97 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 7e17840445ab6f43c6e18c055a9999cd3730b02f..a6eb2c2e8fac83af93d66d9d18b82b8e774ad660 100644
--- a/core/res/Android.bp
+++ b/core/res/Android.bp
@@ -176,3 +176,12 @@ genrule {
         " > $(out)",
     tools: ["xmllint"],
 }
+
+filegroup {
+    name: "frameworks-base-core-AndroidManifest.xml",
+    srcs: ["AndroidManifest.xml"],
+    visibility: [
+        "//frameworks/base",
+        "//frameworks/base/api",
+    ],
+}