Separate updatable-media library (64ed0093) · Commits · e / os / android_frameworks_base

Android.bp

+3 −7

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ java_defaults {
		"rs/java/*/.java",

		":framework-javastream-protos",
		// TODO: Remove this after introduce corresponding srcs under media/java/
		// TODO: Resolve circular library dependency and remove media1-srcs and mediasession2-srcs
		":media1-srcs",
		":mediasession2-srcs",

		@@ -1266,9 +1266,7 @@ stubs_defaults {
		":non_openjdk_javadoc_files",
		":android_icu4j_src_files_for_docs",
		":conscrypt_public_api_files",
		":media1-stubs-srcs",
		":mediasession2-stubs-srcs",
		":mediaplayer2-srcs",
		":media-srcs-without-aidls",
		"test-mock/src/*/.java",
		"test-runner/src/*/.java",
		],
		@@ -1330,9 +1328,7 @@ stubs_defaults {
		":non_openjdk_javadoc_files",
		":android_icu4j_src_files_for_docs",
		":conscrypt_public_api_files",
		":media1-stubs-srcs",
		":mediasession2-stubs-srcs",
		":mediaplayer2-srcs",
		":media-srcs-without-aidls",
		],
		srcs_lib: "framework",
		srcs_lib_whitelist_dirs: frameworks_base_subdirs,

media/Android.bp

+55 −8

Original line number	Diff line number	Diff line
		java_library {
		name: "updatable-media",
		name: "updatable-media1",

		srcs: [
		":media1-srcs",
		":mediasession2-srcs",
		":mediaplayer2-srcs",
		":framework-media-annotation-srcs",
		],

		static_libs: [
		"mediaplayer2-protos",
		aidl: {
		export_include_dirs: [
		"apex/java",
		],

		// TODO: find out a way to include only the necessary aidl files instead of dirs.
		include_dirs: [
		"frameworks/base/core/java",
		"frameworks/base/media/java",
		],
		},

		installable: true,

		// Make sure that the implementaion only relies on SDK or system APIs.
		sdk_version: "system_current",
		}

		java_library {
		name: "updatable-mediasession2",

		srcs: [
		":mediasession2-srcs",
		":framework-media-annotation-srcs",
		],

		aidl: {
		@@ -17,9 +37,9 @@ java_library {
		"apex/java",
		],

		// TODO: find out a way to include only the necessary aidl files instead of dirs.
		include_dirs: [
		"frameworks/base/core/java",
		"frameworks/base/media/java",
		],
		},

		@@ -29,6 +49,33 @@ java_library {
		sdk_version: "system_current",
		}

		java_library {
		name: "updatable-media",

		srcs: [
		":mediaplayer2-srcs",
		":framework-media-annotation-srcs",
		],

		static_libs: [
		"mediaplayer2-protos",
		],

		installable: true,

		// Make sure that the implementaion only relies on SDK or system APIs.
		sdk_version: "system_current",
		}

		filegroup {
		name: "media-srcs-without-aidls",
		srcs : [
		":media1-srcs-without-aidls",
		":mediasession2-srcs-without-aidls",
		":mediaplayer2-srcs",
		],
		}

		filegroup {
		name: "media1-srcs",
		srcs: [
		@@ -56,7 +103,7 @@ filegroup {
		}

		filegroup {
		name: "media1-stubs-srcs",
		name: "media1-srcs-without-aidls",
		srcs: [
		":media1-srcs",
		],
		@@ -90,7 +137,7 @@ filegroup {
		}

		filegroup {
		name: "mediasession2-stubs-srcs",
		name: "mediasession2-srcs-without-aidls",
		srcs: [
		":mediasession2-srcs",
		],