Merge "Add new UnsupportedAppUsage annotation as lib dependency." am: 938bc05883 am: 05057bd860 (a8064166) · Commits · e / os / android_frameworks_base

Android.bp

+6 −3

Original line number	Diff line number	Diff line
		@@ -366,7 +366,9 @@ java_defaults {

		sdk_version: "core_platform",
		libs: [
		"app-compat-annotations",
		"ext",
		"unsupportedappusage",
		"updatable_media_stubs",
		],

		@@ -426,7 +428,6 @@ java_library {
		name: "framework-minus-apex",
		defaults: ["framework-defaults"],
		srcs: [":framework-non-updatable-sources"],
		libs: ["app-compat-annotations"],
		installable: true,
		javac_shard_size: 150,
		required: [
		@@ -468,14 +469,16 @@ java_library {
		defaults: ["framework-defaults"],
		srcs: [":framework-all-sources"],
		installable: false,
		libs: ["app-compat-annotations"],
		}

		java_library {
		name: "framework-annotation-proc",
		defaults: ["framework-defaults"],
		srcs: [":framework-all-sources"],
		libs: ["app-compat-annotations"],
		libs: [
		"app-compat-annotations",
		"unsupportedappusage",
		],
		installable: false,
		plugins: [
		"unsupportedappusage-annotation-processor",

+1 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ droiddoc {
		"android.test.runner",
		"junit",
		"android.test.base",
		"unsupportedappusage",
		],
		custom_template: "droiddoc-templates-sdk",
		installable: false,

+1 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ java_defaults {
		"android.hardware.tetheroffload.control-V1.0-java",
		"tethering-client",
		],
		libs: ["unsupportedappusage"],
		manifest: "AndroidManifestBase.xml",
		}

+1 −0