Merge "Use a filegroup for the AndroidManifest.xml input" am: 7ebe6c537b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2469526 Change-Id: I282b13ff06fb8e068af6b17661fe79295834906a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -506,7 +506,7 @@ metalava_framework_docs_args = "" +
|
|||||||
"--hide Todo " +
|
"--hide Todo " +
|
||||||
"--hide Typo " +
|
"--hide Typo " +
|
||||||
"--hide UnavailableSymbol " +
|
"--hide UnavailableSymbol " +
|
||||||
"--manifest $(location core/res/AndroidManifest.xml) "
|
"--manifest $(location :frameworks-base-core-AndroidManifest.xml) "
|
||||||
|
|
||||||
packages_to_document = [
|
packages_to_document = [
|
||||||
"android",
|
"android",
|
||||||
@@ -543,7 +543,7 @@ stubs_defaults {
|
|||||||
sdk_version: "none",
|
sdk_version: "none",
|
||||||
system_modules: "none",
|
system_modules: "none",
|
||||||
java_version: "1.8",
|
java_version: "1.8",
|
||||||
arg_files: ["core/res/AndroidManifest.xml"],
|
arg_files: [":frameworks-base-core-AndroidManifest.xml"],
|
||||||
aidl: {
|
aidl: {
|
||||||
local_include_dirs: [
|
local_include_dirs: [
|
||||||
"media/aidl",
|
"media/aidl",
|
||||||
|
|||||||
@@ -176,3 +176,12 @@ genrule {
|
|||||||
" > $(out)",
|
" > $(out)",
|
||||||
tools: ["xmllint"],
|
tools: ["xmllint"],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
filegroup {
|
||||||
|
name: "frameworks-base-core-AndroidManifest.xml",
|
||||||
|
srcs: ["AndroidManifest.xml"],
|
||||||
|
visibility: [
|
||||||
|
"//frameworks/base",
|
||||||
|
"//frameworks/base/api",
|
||||||
|
],
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user