Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecff1714 authored Mar 07, 2023 by Anton Hansson Committed by Automerger Merge Worker Mar 07, 2023

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 am: 04884f21 am: 0cc8ca34

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

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

parents bc75392d 0cc8ca34

Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -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

+9 −0

Original line number	Diff line number	Diff line
		@@ -178,3 +178,12 @@ genrule {
		" > $(out)",
		tools: ["xmllint"],
		}

		filegroup {
		name: "frameworks-base-core-AndroidManifest.xml",
		srcs: ["AndroidManifest.xml"],
		visibility: [
		"//frameworks/base",
		"//frameworks/base/api",
		],
		}