From 22d44afc3c807c02b1734c9cbe102132a4be9d87 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Fri, 3 Mar 2023 16:10:03 +0000
Subject: [PATCH] Use a filegroup for the AndroidManifest.xml input

To allow the droidstubs module to be moved to a directory other than
the root, where it would otherwise not be able to access the manifest.

Bug: 271563074
Test: m
Change-Id: Ic437a4157a390d11397de1fe6744ae46a72d2508
---
 Android.bp          | 4 ++--
 core/res/Android.bp | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Android.bp b/Android.bp
index 0c9b82e5990e1..e426b71c56c24 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 93ce7832824b2..42c95d6cfd58b 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",
+    ],
+}