Merge "Build updatable media against the module SDK" (85231d53) · Commits · e / os / android_frameworks_base

apex/media/framework/Android.bp

+1 −20

Original line number	Original line	Diff line number	Diff line
	@@ -19,21 +19,6 @@ java_library {
	":updatable-media-srcs",		":updatable-media-srcs",
	],		],

	aidl: {
	export_include_dirs: [
	"java",
	],

	// It would be great if we don't need to add include_dirs for public
	// parcelable classes. Find a better way.
	include_dirs: [
	// To refer:
	// android.os.Bundle
	// android.os.ResultReceiver
	"frameworks/base/core/java",
	],
	},

	permitted_packages: [		permitted_packages: [
	"android.media",		"android.media",
	],		],
	@@ -46,13 +31,9 @@ java_library {

	installable: true,		installable: true,

	// TODO: build against stable API surface. Use core_platform for now to avoid		sdk_version: "module_current",
	// link-check failure with exoplayer building against "current".
	sdk_version: "core_platform",
	libs: [		libs: [
	// The order matters. android_system_* library should come later.
	"framework_media_annotation",		"framework_media_annotation",
	"android_system_stubs_current",
	],		],

	static_libs: [		static_libs: [