diff options
| author | Chirayu Desai <chirayudesai1@gmail.com> | 2016-08-25 20:36:20 +0530 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-11-18 21:38:36 -0800 |
| commit | 6cd80a60e687621467de35171c6d2790f13fe2a3 (patch) | |
| tree | 40b09bfc539fbf20c6a7c79fa9808cb77d94e76c | |
| parent | 69cbe06c3c482cf78fa71b7e89c470ab83626523 (diff) | |
camera: Use kernel headers
Change-Id: Ib5c0c28cef2558f34e7d71921cd1cb6f55d5c2d8
(cherry picked from commit 4386edb622af9535483f814eda5ee95588e8c54d)
| -rw-r--r-- | camera/QCamera2/HAL/Android.mk | 3 | ||||
| -rw-r--r-- | camera/QCamera2/HAL3/Android.mk | 3 | ||||
| -rwxr-xr-x | camera/QCamera2/stack/mm-camera-interface/Android.mk | 3 | ||||
| -rw-r--r-- | camera/QCamera2/stack/mm-camera-test/Android.mk | 3 | ||||
| -rw-r--r-- | camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk | 2 |
5 files changed, 14 insertions, 0 deletions
diff --git a/camera/QCamera2/HAL/Android.mk b/camera/QCamera2/HAL/Android.mk index 06b4824..e0d1f57 100644 --- a/camera/QCamera2/HAL/Android.mk +++ b/camera/QCamera2/HAL/Android.mk @@ -34,6 +34,9 @@ LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES += \ hardware/qcom/display/msm8974/libgralloc +LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include +LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr + LOCAL_SHARED_LIBRARIES := libcamera_client liblog libhardware libutils libcutils libdl LOCAL_SHARED_LIBRARIES += libmmcamera_interface libmmjpeg_interface diff --git a/camera/QCamera2/HAL3/Android.mk b/camera/QCamera2/HAL3/Android.mk index e185a81..5be3ca8 100644 --- a/camera/QCamera2/HAL3/Android.mk +++ b/camera/QCamera2/HAL3/Android.mk @@ -36,6 +36,9 @@ LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES += \ hardware/qcom/display/msm8974/libgralloc +LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include +LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr + LOCAL_SHARED_LIBRARIES := libcamera_client liblog libhardware libutils libcutils libdl libsync LOCAL_SHARED_LIBRARIES += libmmcamera_interface libmmjpeg_interface libui libcamera_metadata diff --git a/camera/QCamera2/stack/mm-camera-interface/Android.mk b/camera/QCamera2/stack/mm-camera-interface/Android.mk index f60cd10..7f786a5 100755 --- a/camera/QCamera2/stack/mm-camera-interface/Android.mk +++ b/camera/QCamera2/stack/mm-camera-interface/Android.mk @@ -30,6 +30,9 @@ LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES += hardware/qcom/media/mm-core/inc +LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include +LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr + LOCAL_CFLAGS += -Wall -Werror LOCAL_SRC_FILES := $(MM_CAM_FILES) diff --git a/camera/QCamera2/stack/mm-camera-test/Android.mk b/camera/QCamera2/stack/mm-camera-test/Android.mk index a3e99db..9ba30d0 100644 --- a/camera/QCamera2/stack/mm-camera-test/Android.mk +++ b/camera/QCamera2/stack/mm-camera-test/Android.mk @@ -30,6 +30,9 @@ LOCAL_C_INCLUDES+= \ $(LOCAL_PATH)/../../../mm-image-codec/qexif \ $(LOCAL_PATH)/../../../mm-image-codec/qomx_core +LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include +LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr + LOCAL_CFLAGS += -DCAMERA_ION_HEAP_ID=ION_CP_MM_HEAP_ID ifeq ($(call is-board-platform,msm8974),true) LOCAL_CFLAGS += -DCAMERA_GRALLOC_HEAP_ID=GRALLOC_USAGE_PRIVATE_IOMMU_HEAP diff --git a/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk b/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk index 6a5df29..0db9e84 100644 --- a/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk +++ b/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk @@ -24,6 +24,8 @@ LOCAL_C_INCLUDES += $(OMX_HEADER_DIR) LOCAL_C_INCLUDES += $(OMX_CORE_DIR)/qexif LOCAL_C_INCLUDES += $(OMX_CORE_DIR)/qomx_core +LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include +LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr LOCAL_SRC_FILES := mm_jpeg_ionbuf.c LOCAL_SRC_FILES += mm_jpeg_test.c |