media: Stop overriding LOCAL_HEADER_LIBRARIES
LOCAL_HEADER_LIBRARIES was getting overwritten on some modules,
resulting in display_headers not getting picked up.
Change-Id: Ia0263001025fd63e86ccef07f35193833ff71a23
diff --git a/libc2dcolorconvert/Android.mk b/libc2dcolorconvert/Android.mk
index 10dae8d..3ece003 100755
--- a/libc2dcolorconvert/Android.mk
+++ b/libc2dcolorconvert/Android.mk
@@ -15,7 +15,6 @@
libhardware_headers
LOCAL_SHARED_LIBRARIES := liblog libdl
-LOCAL_HEADER_LIBRARIES := libhardware_headers
LOCAL_MODULE_TAGS := optional
diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk
index 80198ee..7e0db14 100755
--- a/mm-video-v4l2/vidc/vdec/Android.mk
+++ b/mm-video-v4l2/vidc/vdec/Android.mk
@@ -114,9 +114,6 @@
LOCAL_SHARED_LIBRARIES += libqdMetaData
LOCAL_SHARED_LIBRARIES += libplatformconfig
LOCAL_SHARED_LIBRARIES += libnativewindow
-LOCAL_HEADER_LIBRARIES := libnativebase_headers
-LOCAL_HEADER_LIBRARIES += media_plugin_headers
-LOCAL_HEADER_LIBRARIES += libhardware_headers
LOCAL_SRC_FILES := src/ts_parser.cpp
LOCAL_STATIC_LIBRARIES := libOmxVidcCommon
diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk
index 76d1d22..b05de93 100644
--- a/mm-video-v4l2/vidc/venc/Android.mk
+++ b/mm-video-v4l2/vidc/venc/Android.mk
@@ -107,8 +107,6 @@
# endif # ($(BOARD_USES_ADRENO), true)
LOCAL_SHARED_LIBRARIES += libqdMetaData
LOCAL_STATIC_LIBRARIES := libOmxVidcCommon
-LOCAL_HEADER_LIBRARIES := media_plugin_headers
-LOCAL_HEADER_LIBRARIES += libhardware_headers
LOCAL_SRC_FILES := src/omx_video_base.cpp
LOCAL_SRC_FILES += src/omx_video_encoder.cpp
@@ -157,8 +155,6 @@
LOCAL_SHARED_LIBRARIES += libutils
endif
-LOCAL_HEADER_LIBRARIES := media_plugin_headers
-
# ifeq ($(BOARD_USES_ADRENO), true)
LOCAL_SHARED_LIBRARIES += libc2dcolorconvert
# endif # ($(BOARD_USES_ADRENO), true)