From 42b930425d4c38acbfc38ec9c5c58aadc5fa31d5 Mon Sep 17 00:00:00 2001 From: Ziyan Date: Sat, 31 Jan 2015 01:16:50 +0100 Subject: omx: remove duplicate OMX headers and refer to originals where needed Now that OMX headers in the framework are very closely matched to TI's ENHANCED_DOMX includes, let's remove the duplicates and stop having to update them any time they change (read: FFMPEG changes). Changes: - Remove all duplicate OMX include files under domx/omx_core/inc - Add include locations to frameworks/native/include/media/openmax for: audio camera domx internals libtiutils Thanks to @Hashcode Change-Id: I38af84f45606fba61058b0d04f941a76f76a15e7 --- camera/Android.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'camera') diff --git a/camera/Android.mk b/camera/Android.mk index d1943cd..7d4c066 100644 --- a/camera/Android.mk +++ b/camera/Android.mk @@ -54,7 +54,10 @@ TI_CAMERAHAL_COMMON_INCLUDES := \ $(LOCAL_PATH)/../libtiutils \ $(LOCAL_PATH)/inc \ frameworks/native/include/media/hardware \ - system/media/camera/include + system/media/camera/include \ + $(DOMX_PATH)/mm_osal/inc \ + $(DOMX_PATH)/omx_core/inc \ + frameworks/native/include/media/openmax TI_CAMERAHAL_COMMON_SRC := \ CameraHal_Module.cpp \ @@ -130,8 +133,6 @@ LOCAL_SRC_FILES:= \ LOCAL_C_INCLUDES += \ $(TI_CAMERAHAL_COMMON_INCLUDES) \ - $(DOMX_PATH)/omx_core/inc \ - $(DOMX_PATH)/mm_osal/inc \ $(LOCAL_PATH)/inc/OMXCameraAdapter LOCAL_SHARED_LIBRARIES:= \ @@ -202,8 +203,6 @@ LOCAL_SRC_FILES:= \ LOCAL_C_INCLUDES += \ $(TI_CAMERAHAL_COMMON_INCLUDES) \ - $(DOMX_PATH)/omx_core/inc \ - $(DOMX_PATH)/mm_osal/inc \ $(LOCAL_PATH)/inc/OMXCameraAdapter \ $(LOCAL_PATH)/inc/V4LCameraAdapter -- cgit v1.1