Merge changes Iabcb5469,Id8302f88,Iadfa594e,If0b10ed9 (89f1f99d) · Commits · e / devices / smdk4412 / 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",
		],
		}

0 → 120000

+1 −0

Original line number	Diff line number	Diff line
		../../media/libstagefright/include/media/stagefright/
		No newline at end of file

+1 −0

Original line number	Diff line number	Diff line
		@@ -22,4 +22,5 @@ LOCAL_C_INCLUDES := \

		LOCAL_CFLAGS += -fvisibility=hidden

		LOCAL_HEADER_LIBRARIES += libhardware_headers
		include $(BUILD_SHARED_LIBRARY)

+2 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ LOCAL_C_INCLUDES += \
		$(LOCAL_PATH)/../lib/Bundle/lib/ \
		$(call include-path-for, audio-effects)

		LOCAL_HEADER_LIBRARIES += libhardware_headers
		include $(BUILD_SHARED_LIBRARY)


		@@ -60,4 +61,5 @@ LOCAL_C_INCLUDES += \
		$(LOCAL_PATH)/../lib/Reverb/lib/ \
		$(call include-path-for, audio-effects)

		LOCAL_HEADER_LIBRARIES += libhardware_headers
		include $(BUILD_SHARED_LIBRARY)