ido: Fix building camera HAL inside lineage env

Change-Id: I29ba4643edf87fc13386fc99b338581fed943440
ido-dev · Mar 30, 2017 · f27111b · f27111b
1 parent f0ce063
commit f27111b
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 20 deletions.
diff --git a/camera/Android.mk b/camera/Android.mk
@@ -1,3 +1,4 @@
+ifeq ($(call my-dir),$(call project-path-for,qcom-camera))
 MM_V4L2_DRIVER_LIST += msm8960
 MM_V4L2_DRIVER_LIST += msm8974
 MM_V4L2_DRIVER_LIST += msm8226
@@ -11,3 +12,4 @@ ifeq ($(call is-board-platform-in-list,$(MM_V4L2_DRIVER_LIST)),true)
       include $(call all-subdir-makefiles)
     endif
 endif
+endif
diff --git a/camera/CleanSpec.mk b/camera/CleanSpec.mk
@@ -44,4 +44,4 @@
 #$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
 #$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
 
-$(call add-clean-step, find $(OUT_DIR) -name "camera.msm8960*" -print0 | xargs -0 rm -rf)
+$(call add-clean-step, find $(OUT_DIR) -name "camera.msm8916*" -print0 | xargs -0 rm -rf)
diff --git a/camera/QCamera/HAL/core/Android.mk b/camera/QCamera/HAL/core/Android.mk
@@ -105,9 +105,10 @@ LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
 LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/media
 LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 
-LOCAL_C_INCLUDES += hardware/qcom/display/libgralloc \
-        hardware/qcom/display/libgenlock \
-        hardware/qcom/media/libstagefrighthw
+LOCAL_C_INCLUDES += $(call project-path-for,qcom-display)/libgralloc \
+        $(call project-path-for,qcom-display)/libgenlock \
+        $(call project-path-for,qcom-media)/libstagefrighthw
+
 
 # if debug service layer and up , use stub camera!
 LOCAL_C_INCLUDES += \

diff --git a/camera/QCamera/HAL2/core/Android.mk b/camera/QCamera/HAL2/core/Android.mk
@@ -53,9 +53,9 @@ LOCAL_C_INCLUDES := \
         $(LOCAL_PATH)/../../stack/mm-jpeg-interface/inc\
         $(TARGET_OUT_INTERMEDIATES)/include/mm-camera-interface_badger \
 
-LOCAL_C_INCLUDES += hardware/qcom/display/libgralloc \
-        hardware/qcom/display/libgenlock \
-        hardware/qcom/media/libstagefrighthw \
+LOCAL_C_INCLUDES += $(call project-path-for,qcom-display)/libgralloc \
+        $(call project-path-for,qcom-display)/libgenlock \
+        $(call project-path-for,qcom-media)/libstagefrighthw \
 	system/media/camera/include
 
 # if debug service layer and up , use stub camera!

diff --git a/camera/QCamera/stack/mm-camera-interface/Android.mk b/camera/QCamera/stack/mm-camera-interface/Android.mk
@@ -42,7 +42,7 @@ LOCAL_C_INCLUDES += \
     $(TARGET_OUT_HEADERS)/mm-still/mm-omx
 # (END) Need to remove later once dependency on jpeg removed
 
-LOCAL_C_INCLUDES+= hardware/qcom/media/mm-core/inc
+LOCAL_C_INCLUDES+= LOCAL_C_INCLUDES+= $(call project-path-for,qcom-media)/mm-core/inc
 LOCAL_CFLAGS += -include bionic/libc/kernel/common/linux/socket.h
 LOCAL_CFLAGS += -include bionic/libc/kernel/common/linux/un.h
 

diff --git a/camera/QCamera2/HAL/Android.mk b/camera/QCamera2/HAL/Android.mk
@@ -31,9 +31,9 @@ endif
 LOCAL_C_INCLUDES := \
         $(LOCAL_PATH)/../stack/common \
         frameworks/native/include/media/openmax \
-        hardware/qcom/display/libgralloc \
-        hardware/qcom/display/libqdutils \
-        hardware/qcom/media/libstagefrighthw \
+        $(call project-path-for,qcom-display)/libgralloc \
+	$(call project-path-for,qcom-display)/libqdutils \
+        $(call project-path-for,qcom-media)/libstagefrighthw \
         system/media/camera/include \
         $(LOCAL_PATH)/../../mm-image-codec/qexif \
         $(LOCAL_PATH)/../../mm-image-codec/qomx_core \
@@ -49,7 +49,7 @@ endif
 #ifeq ($(TARGET_USE_VENDOR_CAMERA_EXT),true)
 #LOCAL_C_INCLUDES += hardware/qcom/display/msm8974/libgralloc
 #else
-LOCAL_C_INCLUDES += hardware/qcom/display/libgralloc
+#LOCAL_C_INCLUDES += hardware/qcom/display/libgralloc
 #endif
 LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
 LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/media
@@ -71,4 +71,4 @@ LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)
 
-include $(LOCAL_PATH)/test/Android.mk
+#include $(LOCAL_PATH)/test/Android.mk
diff --git a/camera/QCamera2/HAL/QCamera2Hal.cpp b/camera/QCamera2/HAL/QCamera2Hal.cpp
@@ -53,6 +53,9 @@ camera_module_t HAL_MODULE_INFO_SYM = {
 #ifndef USE_KK_CODE
     open_legacy: NULL,
 #endif
-    reserved:  {0}
+    set_torch_mode: NULL,
+    init: NULL,
+    reserved: {0}
+
 //#endif
 };
diff --git a/camera/QCamera2/HAL/test/Android.mk b/camera/QCamera2/HAL/test/Android.mk
@@ -39,7 +39,7 @@ LOCAL_C_INCLUDES += \
     frameworks/base/include/media \
     external/skia/include/core \
     external/skia/include/images \
-    hardware/qcom/display/libgralloc \
+    $(call project-path-for,qcom-display)/libgralloc \
     frameworks/av/include/media/stagefright \
     frameworks/native/include/media/openmax \
 

diff --git a/camera/QCamera2/stack/common/cam_list.h b/camera/QCamera2/stack/common/cam_list.h
@@ -34,6 +34,8 @@
 #define __CAMLIST_H
 
 #include <stddef.h>
+#include <string.h>
+#include <stdlib.h>
 
 #define member_of(ptr, type, member) ({ \
   const typeof(((type *)0)->member) *__mptr = (ptr); \

diff --git a/camera/QCamera2/stack/common/cam_types.h b/camera/QCamera2/stack/common/cam_types.h
@@ -34,6 +34,8 @@
 #include <pthread.h>
 #include <inttypes.h>
 #include <media/msmb_camera.h>
+#include <stdlib.h>
+#include <string.h>
 
 #define CAM_MAX_NUM_BUFS_PER_STREAM  (24)
 #define MAX_METADATA_PAYLOAD_SIZE    (1024)

diff --git a/camera/QCamera2/stack/mm-camera-interface/Android.mk b/camera/QCamera2/stack/mm-camera-interface/Android.mk
@@ -34,7 +34,7 @@ LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
 LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/media
 LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 
-LOCAL_C_INCLUDES += hardware/qcom/media/mm-core/inc
+LOCAL_C_INCLUDES += $(call project-path-for,qcom-media)/mm-core/inc
 ifeq ($(call is-platform-sdk-version-at-least,20),true)
 LOCAL_C_INCLUDES += system/media/camera/include
 endif

diff --git a/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk b/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk
@@ -16,7 +16,7 @@ LOCAL_CFLAGS += -DUSE_ION
 endif
 
 OMX_HEADER_DIR := frameworks/native/include/media/openmax
-OMX_CORE_DIR := hardware/qcom/camera/mm-image-codec
+OMX_CORE_DIR := $(call project-path-for,qcom-camera)/mm-image-codec
 
 LOCAL_C_INCLUDES := $(MM_JPEG_TEST_PATH)
 LOCAL_C_INCLUDES += $(MM_JPEG_TEST_PATH)/../inc
@@ -27,7 +27,7 @@ LOCAL_C_INCLUDES += $(OMX_CORE_DIR)/qomx_core
 
 ifneq ($(strip $(USE_BIONIC_HEADER)),true)
 LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-LOCAL_C_INCLUDES += hardware/qcom/camera
+LOCAL_C_INCLUDES += $(call project-path-for,qcom-camera)
 endif
 LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 
@@ -60,7 +60,7 @@ LOCAL_CFLAGS += -DUSE_ION
 endif
 
 OMX_HEADER_DIR := frameworks/native/include/media/openmax
-OMX_CORE_DIR := hardware/qcom/camera/mm-image-codec
+OMX_CORE_DIR := $(call project-path-for,qcom-camera)/mm-image-codec
 
 LOCAL_C_INCLUDES := $(MM_JPEG_TEST_PATH)
 LOCAL_C_INCLUDES += $(MM_JPEG_TEST_PATH)/../inc
@@ -71,7 +71,7 @@ LOCAL_C_INCLUDES += $(OMX_CORE_DIR)/qomx_core
 
 ifneq ($(strip $(USE_BIONIC_HEADER)),true)
 LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-LOCAL_C_INCLUDES += hardware/qcom/camera
+OCAL_C_INCLUDES += $(call project-path-for,qcom-camera)
 endif
 LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 

diff --git a/camera/mm-image-codec/qomx_core/qomx_core.h b/camera/mm-image-codec/qomx_core/qomx_core.h
@@ -34,6 +34,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/
 #include <pthread.h>
 #include <dlfcn.h>
 #include <stdlib.h>
+#include <string.h>
 #include "OMX_Component.h"
 
 #define TRUE 1