diff options
Diffstat (limited to 'camera/Android.mk')
| -rw-r--r-- | camera/Android.mk | 64 |
1 files changed, 60 insertions, 4 deletions
diff --git a/camera/Android.mk b/camera/Android.mk index 35d4435..f97b2a9 100644 --- a/camera/Android.mk +++ b/camera/Android.mk @@ -2,8 +2,9 @@ ifeq ($(TARGET_BOARD_PLATFORM),omap4) LOCAL_PATH:= $(call my-dir) -OMAP4_CAMERA_HAL_USES:= OMX -# OMAP4_CAMERA_HAL_USES:= USB +#OMAP4_CAMERA_HAL_USES:= OMX +#OMAP4_CAMERA_HAL_USES:= USB +OMAP4_CAMERA_HAL_USES:= ALL ifdef TI_CAMERAHAL_DEBUG_ENABLED # Enable CameraHAL debug logs @@ -39,6 +40,7 @@ OMAP4_CAMERA_HAL_SRC := \ AppCallbackNotifier.cpp \ ANativeWindowDisplayAdapter.cpp \ CameraProperties.cpp \ + BaseCameraAdapter.cpp \ MemoryManager.cpp \ Encoder_libjpeg.cpp \ SensorListener.cpp \ @@ -50,7 +52,6 @@ OMAP4_CAMERA_COMMON_SRC:= \ CameraHalCommon.cpp OMAP4_CAMERA_OMX_SRC:= \ - BaseCameraAdapter.cpp \ OMXCameraAdapter/OMX3A.cpp \ OMXCameraAdapter/OMXAlgo.cpp \ OMXCameraAdapter/OMXCameraAdapter.cpp \ @@ -64,7 +65,6 @@ OMAP4_CAMERA_OMX_SRC:= \ OMXCameraAdapter/OMXDccDataSave.cpp \ OMAP4_CAMERA_USB_SRC:= \ - BaseCameraAdapter.cpp \ V4LCameraAdapter/V4LCameraAdapter.cpp # @@ -112,6 +112,7 @@ LOCAL_SHARED_LIBRARIES:= \ libjpeg \ libexif +CAMERAHAL_CFLAGS += -DOMX_CAMERA_ADAPTER LOCAL_CFLAGS := -fno-short-enums -DCOPY_IMAGE_BUFFER $(CAMERAHAL_CFLAGS) LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw @@ -170,6 +171,61 @@ LOCAL_MODULE:= camera.$(TARGET_BOARD_PLATFORM) LOCAL_MODULE_TAGS:= optional include $(BUILD_HEAPTRACKED_SHARED_LIBRARY) + +else +ifeq ($(OMAP4_CAMERA_HAL_USES),ALL) + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES:= \ + $(OMAP4_CAMERA_HAL_SRC) \ + $(OMAP4_CAMERA_OMX_SRC) \ + $(OMAP4_CAMERA_USB_SRC) \ + $(OMAP4_CAMERA_COMMON_SRC) + +LOCAL_C_INCLUDES += \ + $(LOCAL_PATH)/inc/ \ + $(LOCAL_PATH)/../hwc \ + $(LOCAL_PATH)/../include \ + $(LOCAL_PATH)/inc/OMXCameraAdapter \ + $(LOCAL_PATH)/inc/V4LCameraAdapter \ + $(LOCAL_PATH)/../libtiutils \ + hardware/ti/omap4xxx/tiler \ + hardware/ti/omap4xxx/ion \ + frameworks/base/include/ui \ + frameworks/base/include/utils \ + $(DOMX_PATH)/omx_core/inc \ + $(DOMX_PATH)/mm_osal/inc \ + frameworks/base/include/media/stagefright \ + frameworks/base/include/media/stagefright/openmax \ + external/jpeg \ + external/jhead + +LOCAL_SHARED_LIBRARIES:= \ + libui \ + libbinder \ + libutils \ + libcutils \ + libtiutils \ + libmm_osal \ + libOMX_Core \ + libcamera_client \ + libgui \ + libdomx \ + libion \ + libjpeg \ + libexif + +CAMERAHAL_CFLAGS += -DOMX_CAMERA_ADAPTER -DV4L_CAMERA_ADAPTER +LOCAL_CFLAGS := -fno-short-enums -DCOPY_IMAGE_BUFFER $(CAMERAHAL_CFLAGS) + +LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw +LOCAL_MODULE:= camera.$(TARGET_BOARD_PLATFORM) +LOCAL_MODULE_TAGS:= optional + +include $(BUILD_HEAPTRACKED_SHARED_LIBRARY) + +endif endif endif endif |