Merge "Revert "Replace framework-annotation-proc java lib with framework-all"" (84ef8e1d) · Commits · e / os / android_frameworks_base

Android.bp

+10 −2

Original line number	Diff line number	Diff line
		@@ -467,6 +467,14 @@ java_library {
		srcs: [":framework-all-sources"],
		installable: false,
		libs: ["app-compat-annotations"],
		}

		java_library {
		name: "framework-annotation-proc",
		defaults: ["framework-aidl-export-defaults"],
		srcs: [":framework-all-sources"],
		libs: ["app-compat-annotations"],
		installable: false,
		plugins: [
		"unsupportedappusage-annotation-processor",
		"compat-changeid-annotation-processor",
		@@ -475,7 +483,7 @@ java_library {

		platform_compat_config {
		name: "framework-platform-compat-config",
		src: ":framework-all",
		src: ":framework-annotation-proc",
		}

		// A library including just UnsupportedAppUsage.java classes.
		@@ -1600,7 +1608,7 @@ aidl_mapping {

		genrule {
		name: "framework-annotation-proc-index",
		srcs: [":framework-all"],
		srcs: [":framework-annotation-proc"],
		cmd: "unzip -qp $(in) unsupportedappusage/unsupportedappusage_index.csv > $(out)",
		out: ["unsupportedappusage_index.csv"],
		dist: {