semc: added camera source,kernel and other fixes

Change-Id: I3ba20d8858f1c820a7b31695202f2918f9f1c24d

BoardConfig.mk

@@ -52,6 +52,3 @@ BOARD_SDCARD_INTERNAL_DEVICE := /dev/block/mmcblk0p1
 TARGET_RELEASETOOL_OTA_FROM_TARGET_SCRIPT := device/semc/es209ra/releasetools/semc_ota_from_target_files
 
 TARGET_OTA_ASSERT_DEVICE := X10i,X10a,es209ra
-
-BOARD_CAMERA_USE_GETBUFFERINFO := true
-

device_es209ra.mk

@@ -17,7 +17,6 @@ PRODUCT_PACKAGES += \
     copybit.qsd8k \
     gps.es209ra \
     lights.es209ra \
-    libOmxCore \
     libOmxVdec \
     libOmxVidEnc \
     libmm-omxcore \

libcamera/Android.mk

@@ -1,16 +1,36 @@
+ifeq ($(TARGET_BOOTLOADER_BOARD_NAME),es209ra)
+
+# When zero we link against libmmcamera; when 1, we dlopen libmmcamera.
+DLOPEN_LIBMMCAMERA:=1
+
+
 LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
 
-LOCAL_SRC_FILES:= LibCameraWrapper.cpp
+LOCAL_SRC_FILES:= QualcommCameraHardware.cpp
 
-LOCAL_SHARED_LIBRARIES:= libdl libutils libcutils libcamera_client
+LOCAL_CFLAGS:= -DDLOPEN_LIBMMCAMERA=$(DLOPEN_LIBMMCAMERA)
 
-LOCAL_MODULE := libcamera
-LOCAL_MODULE_TAGS := optional
+## Can be raised to 6 to improve framerate, at the cost of allocating
+## more ADSP memory. Use 0xa68000 as pool size in kernel to test
+LOCAL_CFLAGS+= -DNUM_PREVIEW_BUFFERS=4 -D_ANDROID_
+
+LOCAL_C_INCLUDES+= \
+    $(TARGET_OUT_HEADERS)/mm-camera \
+    $(TARGET_OUT_HEADERS)/mm-still/jpeg \
 
-LOCAL_PRELINK_MODULE := false
+LOCAL_SHARED_LIBRARIES:= libutils libui libcamera_client liblog libcutils libmmjpeg
 
+LOCAL_SHARED_LIBRARIES+= libbinder
+ifneq ($(DLOPEN_LIBMMCAMERA),1)
+LOCAL_SHARED_LIBRARIES+= liboemcamera
+else
+LOCAL_SHARED_LIBRARIES+= libdl
+endif
 
+LOCAL_MODULE:= libcamera
 include $(BUILD_SHARED_LIBRARY)
 
+endif