Merge "bpfmt -w Android.bp" am: c51996859d am: 829f3f0e14 am: 7e1f1e7654 (de282f23) · Commits · e / os / android_frameworks_base

Android.bp

+33 −34

Original line number	Diff line number	Diff line
		@@ -738,7 +738,7 @@ java_defaults {
		"system/security/keystore/binder",
		],

		generate_get_transaction_name: true
		generate_get_transaction_name: true,
		},

		exclude_srcs: [
		@@ -876,7 +876,7 @@ gensrcs {
		name: "framework-javastream-protos",
		depfile: true,

		tool_files: [ "tools/genprotos.sh", ],
		tool_files: ["tools/genprotos.sh"],
		tools: [
		"aprotoc",
		"protoc-gen-javastream",
		@@ -911,7 +911,7 @@ filegroup {
		"core/java/android/annotation/UnsupportedAppUsage.java",
		"core/java/com/android/internal/annotations/GuardedBy.java",
		"core/java/com/android/internal/annotations/VisibleForTesting.java",
		]
		],
		}

		filegroup {
		@@ -932,7 +932,7 @@ filegroup {
		"core/java/com/android/internal/util/TrafficStatsConstants.java",
		"core/java/com/android/internal/util/WakeupMessage.java",
		"core/java/android/net/shared/*.java",
		]
		],
		}

		// Build ext.jar
		@@ -1703,10 +1703,9 @@ droidstubs {
		args: metalava_framework_docs_args +
		" --show-unannotated " +
		" --show-annotation android.annotation.SystemApi " +
		" --show-annotation android.annotation.TestApi "
		" --show-annotation android.annotation.TestApi ",
		}


		droidstubs {
		name: "hiddenapi-mappings",
		defaults: ["metalava-api-stubs-default"],
		@@ -1725,7 +1724,7 @@ droidstubs {
		" --hide UnhiddenSystemApi " +
		" --show-unannotated " +
		" --show-annotation android.annotation.SystemApi " +
		" --show-annotation android.annotation.TestApi "
		" --show-annotation android.annotation.TestApi ",
		}

		filegroup {
		@@ -1849,5 +1848,5 @@ filegroup {
		aidl_mapping {
		name: "framework-aidl-mappings",
		srcs: [":framework-defaults"],
		output: "framework-aidl-mappings.txt"
		output: "framework-aidl-mappings.txt",
		}