diff options
| author | Zhao Wei Liew <zhaoweiliew@gmail.com> | 2016-01-31 14:23:46 +0800 |
|---|---|---|
| committer | Zhao Wei Liew <zhaoweiliew@gmail.com> | 2016-02-15 17:46:56 +0800 |
| commit | 7594a484665b9b42689e7f5a1449ac65da275d95 (patch) | |
| tree | b6475a274b52e794a007b1ac6589f3ad832f0813 | |
| parent | 9a3a4c63d0021dec73fcea904296acb441f8ae53 (diff) | |
flo: Include kernel headers for camera HAL
After removing the prebuilt kernel headers, we need to include
the kernel headers from source to fix the build.
Change-Id: I0e7074076db50032862ae4d8f001580405e9cd99
| -rw-r--r-- | camera/QCamera2/HAL/Android.mk | 4 | ||||
| -rw-r--r-- | camera/QCamera2/HAL3/Android.mk | 4 | ||||
| -rwxr-xr-x | camera/QCamera2/stack/mm-camera-interface/Android.mk | 4 | ||||
| -rw-r--r-- | camera/QCamera2/stack/mm-camera-test/Android.mk | 4 | ||||
| -rw-r--r-- | camera/QCamera2/stack/mm-jpeg-interface/Android.mk | 4 |
5 files changed, 20 insertions, 0 deletions
diff --git a/camera/QCamera2/HAL/Android.mk b/camera/QCamera2/HAL/Android.mk index b1b7efc..57de7b8 100644 --- a/camera/QCamera2/HAL/Android.mk +++ b/camera/QCamera2/HAL/Android.mk @@ -37,6 +37,10 @@ LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES += \ $(call project-path-for,qcom-display)/libgralloc +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_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 1402121..8528142 100644 --- a/camera/QCamera2/HAL3/Android.mk +++ b/camera/QCamera2/HAL3/Android.mk @@ -30,6 +30,10 @@ LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES += \ $(call project-path-for,qcom-display)/libgralloc +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_SHARED_LIBRARIES := libcamera_client liblog libhardware libutils libcutils libdl 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 8ac5b43..6f27b22 100755 --- a/camera/QCamera2/stack/mm-camera-interface/Android.mk +++ b/camera/QCamera2/stack/mm-camera-interface/Android.mk @@ -28,6 +28,10 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/inc \ $(LOCAL_PATH)/../common +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 += $(call project-path-for,qcom-media)/mm-core/inc LOCAL_CFLAGS += -Wall -Werror diff --git a/camera/QCamera2/stack/mm-camera-test/Android.mk b/camera/QCamera2/stack/mm-camera-test/Android.mk index a3e99db..2c19693 100644 --- a/camera/QCamera2/stack/mm-camera-test/Android.mk +++ b/camera/QCamera2/stack/mm-camera-test/Android.mk @@ -30,6 +30,10 @@ 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/media +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/Android.mk b/camera/QCamera2/stack/mm-jpeg-interface/Android.mk index ae1ab73..fba0853 100644 --- a/camera/QCamera2/stack/mm-jpeg-interface/Android.mk +++ b/camera/QCamera2/stack/mm-jpeg-interface/Android.mk @@ -4,6 +4,10 @@ include $(CLEAR_VARS) LOCAL_CFLAGS+= -D_ANDROID_ +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 += \ frameworks/native/include/media/openmax \ $(LOCAL_PATH)/inc \ |