diff options
| author | Iliyan Malchev <malchev@google.com> | 2011-06-06 17:56:20 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-06-07 11:31:54 -0700 |
| commit | 05df7dc0a5f8949f39a98afe988066b92239cbae (patch) | |
| tree | b33825750761a18c353c233d7b544b110aac98aa /libcamera/Android.mk | |
| parent | 980f99a0fa54f8263a69cf9e159386ac0ba6a8ca (diff) | |
| download | device_samsung_crespo-05df7dc0a5f8949f39a98afe988066b92239cbae.zip device_samsung_crespo-05df7dc0a5f8949f39a98afe988066b92239cbae.tar.gz device_samsung_crespo-05df7dc0a5f8949f39a98afe988066b92239cbae.tar.bz2 | |
crespo: enable camera (wip)
Change-Id: I2884f34700cd1cd66f0604378cf12b713263a9d1
Signed-off-by: Iliyan Malchev <malchev@google.com>
Diffstat (limited to 'libcamera/Android.mk')
| -rw-r--r-- | libcamera/Android.mk | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/libcamera/Android.mk b/libcamera/Android.mk index 79f4e3c..8ba100a 100644 --- a/libcamera/Android.mk +++ b/libcamera/Android.mk @@ -1,42 +1,25 @@ ifneq ($(filter crespo crespo4g,$(TARGET_DEVICE)),) -# When zero we link against libqcamera; when 1, we dlopen libqcamera. -ifeq ($(BOARD_CAMERA_LIBRARIES),libcamera) - -DLOPEN_LIBSECCAMERA:=1 - LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_CFLAGS:=-fno-short-enums -LOCAL_CFLAGS+=-DDLOPEN_LIBSECCAMERA=$(DLOPEN_LIBSECCAMERA) +# HAL module implemenation stored in +# hw/<COPYPIX_HARDWARE_MODULE_ID>.<ro.product.board>.so +LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include LOCAL_C_INCLUDES += $(LOCAL_PATH)/../libs3cjpeg - LOCAL_SRC_FILES:= \ - SecCamera.cpp \ - SecCameraHWInterface.cpp + SecCamera.cpp SecCameraHWInterface.cpp - -LOCAL_SHARED_LIBRARIES:= libutils libui liblog libbinder libcutils +LOCAL_SHARED_LIBRARIES:= libutils libcutils libbinder liblog libcamera_client libhardware LOCAL_SHARED_LIBRARIES+= libs3cjpeg -LOCAL_SHARED_LIBRARIES+= libcamera_client -ifeq ($(BOARD_USES_OVERLAY),true) -LOCAL_CFLAGS += -DBOARD_USES_OVERLAY -endif - -ifeq ($(DLOPEN_LIBSECCAMERA),1) -LOCAL_SHARED_LIBRARIES+= libdl -endif - -LOCAL_MODULE:= libcamera +LOCAL_MODULE := camera.$(TARGET_BOARD_PLATFORM) LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) endif -endif |