Merge "libdrmclearkeyplugin is linked against libstagefright_foundation_vendor" into oc-dr1-dev (95fb5344) · Commits · e / os / android_frameworks_av

drm/mediadrm/plugins/clearkey/Android.bp

+6 −1

Original line number	Diff line number	Diff line
		@@ -38,12 +38,17 @@ cc_library_shared {
		shared_libs: [
		"libcrypto",
		"liblog",
		"libstagefright_foundation",
		"libstagefright_foundation_vendor",
		"libutils",
		],

		static_libs: ["libjsmn"],

		include_dirs: [
		"frameworks/native/include",
		"frameworks/av/include",
		],

		export_include_dirs: ["."],
		export_static_lib_headers: ["libjsmn"],
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@

		cc_test {
		name: "ClearKeyDrmUnitTest",
		vendor: true,

		srcs: [
		"AesCtrDecryptorUnittest.cpp",
		@@ -30,7 +31,7 @@ cc_test {
		"libcrypto",
		"libdrmclearkeyplugin",
		"liblog",
		"libstagefright_foundation",
		"libstagefright_foundation_vendor",
		"libutils",
		],
		}