Merge "Remove custom annotation libs" into sc-dev (209c97aa) · Commits · e / os / android_frameworks_base

Android.bp

+6 −25

Original line number	Original line	Diff line number	Diff line
	@@ -850,10 +850,14 @@ filegroup {
	srcs: [		srcs: [
	"core/java/android/annotation/AnyThread.java",		"core/java/android/annotation/AnyThread.java",
	"core/java/android/annotation/AppIdInt.java",		"core/java/android/annotation/AppIdInt.java",
	"core/java/android/annotation/CallSuper.java",		"core/java/android/annotation/BytesLong.java",
	"core/java/android/annotation/CallbackExecutor.java",		"core/java/android/annotation/CallbackExecutor.java",
			"core/java/android/annotation/CallSuper.java",
	"core/java/android/annotation/CheckResult.java",		"core/java/android/annotation/CheckResult.java",
	"core/java/android/annotation/CurrentTimeMillisLong.java",		"core/java/android/annotation/CurrentTimeMillisLong.java",
			"core/java/android/annotation/CurrentTimeSecondsLong.java",
			"core/java/android/annotation/DrawableRes.java",
			"core/java/android/annotation/DurationMillisLong.java",
	"core/java/android/annotation/Hide.java",		"core/java/android/annotation/Hide.java",
	"core/java/android/annotation/IntDef.java",		"core/java/android/annotation/IntDef.java",
	"core/java/android/annotation/IntRange.java",		"core/java/android/annotation/IntRange.java",
	@@ -871,8 +875,8 @@ filegroup {
	"core/java/android/annotation/UserIdInt.java",		"core/java/android/annotation/UserIdInt.java",
	"core/java/android/annotation/WorkerThread.java",		"core/java/android/annotation/WorkerThread.java",
	"core/java/com/android/internal/annotations/GuardedBy.java",		"core/java/com/android/internal/annotations/GuardedBy.java",
	"core/java/com/android/internal/annotations/VisibleForTesting.java",
	"core/java/com/android/internal/annotations/Immutable.java",		"core/java/com/android/internal/annotations/Immutable.java",
			"core/java/com/android/internal/annotations/VisibleForTesting.java",
	],		],
	}		}

	@@ -886,7 +890,6 @@ filegroup {
	name: "framework-ike-shared-srcs",		name: "framework-ike-shared-srcs",
	visibility: ["//packages/modules/IPsec"],		visibility: ["//packages/modules/IPsec"],
	srcs: [		srcs: [
	"core/java/android/annotation/StringDef.java",
	"core/java/android/net/annotations/PolicyDirection.java",		"core/java/android/net/annotations/PolicyDirection.java",
	"core/java/com/android/internal/util/HexDump.java",		"core/java/com/android/internal/util/HexDump.java",
	"core/java/com/android/internal/util/IState.java",		"core/java/com/android/internal/util/IState.java",
	@@ -1360,28 +1363,6 @@ python_binary_host {
	],		],
	}		}

	filegroup {
	name: "framework-media-annotation-srcs",
	srcs: [
	":framework-annotations",
	"core/java/android/annotation/CallbackExecutor.java",
	"core/java/android/annotation/CallSuper.java",
	"core/java/android/annotation/DrawableRes.java",
	"core/java/android/annotation/LongDef.java",
	"core/java/android/annotation/StringDef.java",
	],
	}

	filegroup {
	name: "framework-mediaprovider-annotation-sources",
	srcs: [
	":framework-annotations",
	"core/java/android/annotation/BytesLong.java",
	"core/java/android/annotation/CurrentTimeSecondsLong.java",
	"core/java/android/annotation/DurationMillisLong.java",
	],
	}

	// Avoid including Parcelable classes as we don't want to have two copies of		// Avoid including Parcelable classes as we don't want to have two copies of
	// Parcelable cross the libraries. This is used by telephony-common (frameworks/opt/telephony)		// Parcelable cross the libraries. This is used by telephony-common (frameworks/opt/telephony)
	// and TeleService app (packages/services/Telephony).		// and TeleService app (packages/services/Telephony).

apex/media/framework/Android.bp

+1 −14

Original line number	Original line	Diff line number	Diff line
	@@ -41,9 +41,7 @@ java_library {
	installable: true,		installable: true,

	sdk_version: "module_current",		sdk_version: "module_current",
	libs: [		libs: ["framework-annotations-lib"],
	"framework_media_annotation",
	],
	static_libs: [		static_libs: [
	"exoplayer2-extractor",		"exoplayer2-extractor",
	"mediatranscoding_aidl_interface-java",		"mediatranscoding_aidl_interface-java",
	@@ -138,20 +136,9 @@ java_sdk_library {
	api_lint: {		api_lint: {
	enabled: false,		enabled: false,
	},		},

	libs: [
	"framework_media_annotation",
	],
	impl_library_visibility: ["//frameworks/av/apex:__subpackages__"],		impl_library_visibility: ["//frameworks/av/apex:__subpackages__"],
	}		}

	java_library {
	name: "framework_media_annotation",
	srcs: [":framework-media-annotation-srcs"],
	installable: false,
	sdk_version: "core_current",
	}

	cc_library_shared {		cc_library_shared {
	name: "libmediaparser-jni",		name: "libmediaparser-jni",
	srcs: [		srcs: [