Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d53d7a8 authored Jun 20, 2017 by Treehugger Robot Committed by Gerrit Code Review Jun 20, 2017

Merge changes Iabcb5469,Id8302f88,Iadfa594e,If0b10ed9

* changes:
  Add libhardware_headers to various modules
  libdrmclearkeyplugin is linked against libstagefright_foundation_vendor
  provide libstagefright_foundation_vendor to vendors
  Move libstagefright headers to media/libstagefright/include

parents c3f020b2 1b7dfe7d

drm/mediadrm/plugins/clearkey/Android.bp

+6 −1

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

	static_libs: ["libjsmn"],		static_libs: ["libjsmn"],

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

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

drm/mediadrm/plugins/clearkey/tests/Android.bp

+2 −1

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

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

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

include/media/stagefright

0 → 120000

+1 −0

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

media/libeffects/downmix/Android.mk

+1 −0

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

	LOCAL_CFLAGS += -fvisibility=hidden		LOCAL_CFLAGS += -fvisibility=hidden

			LOCAL_HEADER_LIBRARIES += libhardware_headers
	include $(BUILD_SHARED_LIBRARY)		include $(BUILD_SHARED_LIBRARY)

media/libeffects/lvm/wrapper/Android.mk

+2 −0

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

			LOCAL_HEADER_LIBRARIES += libhardware_headers
	include $(BUILD_SHARED_LIBRARY)		include $(BUILD_SHARED_LIBRARY)


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

			LOCAL_HEADER_LIBRARIES += libhardware_headers
	include $(BUILD_SHARED_LIBRARY)		include $(BUILD_SHARED_LIBRARY)