1 files changed, 34 insertions, 25 deletions
diff --git a/libcamera/Android.mk b/libcamera/Android.mk
index 9e7dc3e..1275cfa 100644
--- a/libcamera/Android.mk
+++ b/libcamera/Android.mk
@@ -1,28 +1,37 @@
-ifneq ($(USE_CAMERA_STUB),true)
-
-LOCAL_PATH := $(call my-dir)
-
+LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES :=       \
-    CameraHardware.cpp   \
-    V4L2Camera.cpp       \
-    convert.S
-
-LOCAL_C_INCLUDES += external/jpeg
-
-LOCAL_MODULE := libcamera
-LOCAL_MODULE_TAGS := optional
-LOCAL_PRELINK_MODULE := false
-
-LOCAL_SHARED_LIBRARIES := \
-    libui                 \
-    libjpeg               \
-    libutils              \
-    libbinder             \
-    libcutils             \
-    libcamera_client
+LOCAL_SRC_FILES:= \
+	CameraHal_Module.cpp \
+        V4L2Camera.cpp \
+        CameraHardware.cpp \
+        convert.S \
+        rgbconvert.c
+
+LOCAL_C_INCLUDES += \
+    $(LOCAL_PATH)/inc/ \
+    hardware/ti/omap4xxx/hwc \
+    frameworks/base/include/ui \
+    frameworks/base/include/utils \
+    hardware/ti/omap4xxx/domx/omx_core/inc \
+    hardware/ti/omap4xxx/domx/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 \
+    libcamera_client \
+    libcameraservice \
+    libgui \
+    libjpeg \
+    libexif
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_MODULE:= camera.$(TARGET_BOARD_PLATFORM)
+LOCAL_MODULE_TAGS:= optional
 
 include $(BUILD_SHARED_LIBRARY)
-
-endif