diff options
| author | Prateek Chaubey <chaubeyprateek@gmail.com> | 2018-01-07 21:01:56 +0530 |
|---|---|---|
| committer | Davide Garberi <dade.garberi@gmail.com> | 2018-01-19 14:09:15 +0100 |
| commit | c738fd68836e01567b19868f7e3a586f15c6dc98 (patch) | |
| tree | 899a99d3ccde1771ef14a807a4d09f8544c29cac /camera/QCamera2 | |
| parent | 6616278131edd80a12545085e06ee6b0e0a0a788 (diff) | |
msm8996-common: camera: Fixes to OSS camera hal to build in LineageOS tree
Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
Diffstat (limited to 'camera/QCamera2')
| -rw-r--r-- | camera/QCamera2/Android.mk | 8 | ||||
| -rw-r--r-- | camera/QCamera2/HAL/test/Android.mk | 4 | ||||
| -rw-r--r-- | camera/QCamera2/stack/mm-camera-interface/Android.mk | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/camera/QCamera2/Android.mk b/camera/QCamera2/Android.mk index c89f4a0..369b5bd 100644 --- a/camera/QCamera2/Android.mk +++ b/camera/QCamera2/Android.mk @@ -68,15 +68,15 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/util \ $(LOCAL_PATH)/HAL3 \ hardware/libhardware/include/hardware \ - hardware/qcom/media/libstagefrighthw \ - hardware/qcom/media/mm-core/inc \ + $(call project-path-for,qcom-media)/libstagefrighthw \ + $(call project-path-for,qcom-media)/mm-core/inc \ system/core/include/cutils \ system/core/include/system \ system/media/camera/include/system #HAL 1.0 Include paths LOCAL_C_INCLUDES += \ - hardware/qcom/camera/QCamera2/HAL + $(LOCAL_PATH)/HAL ifeq ($(TARGET_COMPILE_WITH_MSM_KERNEL),true) LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include @@ -98,7 +98,7 @@ endif LOCAL_C_INCLUDES += \ $(TARGET_OUT_HEADERS)/qcom/display LOCAL_C_INCLUDES += \ - hardware/qcom/display/libqservice + $(call project-path-for,qcom-display)/libqservice LOCAL_SHARED_LIBRARIES := libcamera_client liblog libhardware libutils libcutils libdl libsync libgui LOCAL_SHARED_LIBRARIES += libmmcamera_interface libmmjpeg_interface libui libcamera_metadata LOCAL_SHARED_LIBRARIES += libqdMetaData libqservice libbinder diff --git a/camera/QCamera2/HAL/test/Android.mk b/camera/QCamera2/HAL/test/Android.mk index 3744034..f3137c7 100644 --- a/camera/QCamera2/HAL/test/Android.mk +++ b/camera/QCamera2/HAL/test/Android.mk @@ -37,8 +37,8 @@ LOCAL_C_INCLUDES += \ external/skia/include/core \ external/skia/include/images \ $(TARGET_OUT_HEADERS)/qcom/display \ - hardware/qcom/camera/QCamera2/stack/common \ - hardware/qcom/camera/QCamera2/stack/mm-camera-interface/inc \ + $(LOCAL_PATH)/../stack/common \ + $(LOCAL_PATH)/../stack/mm-camera-interface/inc \ frameworks/av/include/media/stagefright \ frameworks/native/include/media/openmax \ $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include diff --git a/camera/QCamera2/stack/mm-camera-interface/Android.mk b/camera/QCamera2/stack/mm-camera-interface/Android.mk index a229734..169c1cf 100644 --- a/camera/QCamera2/stack/mm-camera-interface/Android.mk +++ b/camera/QCamera2/stack/mm-camera-interface/Android.mk @@ -36,7 +36,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/inc \ $(LOCAL_PATH)/../common \ hardware/libhardware/include/hardware \ - hardware/qcom/media/mm-core/inc \ + $(call project-path-for,qcom-media)/media/mm-core/inc \ system/media/camera/include \ LOCAL_CFLAGS += -DCAMERA_ION_HEAP_ID=ION_IOMMU_HEAP_ID |