From beeb8314a2515f9b5148e8bfe8cf0df17973574a Mon Sep 17 00:00:00 2001 From: Zhao Wei Liew Date: Sun, 12 Feb 2017 05:27:18 +0800 Subject: [PATCH] land: camera: Use project pathmap Change-Id: I90c00fa50deed656e21391b9d39a4821049359dd --- camera/QCamera2/Android.mk | 8 ++++---- camera/QCamera2/HAL/test/Android.mk | 2 +- camera/QCamera2/stack/mm-camera-interface/Android.mk | 2 +- camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/camera/QCamera2/Android.mk b/camera/QCamera2/Android.mk index 7d5bb50..39c8cfb 100644 --- a/camera/QCamera2/Android.mk +++ b/camera/QCamera2/Android.mk @@ -62,15 +62,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 + $(call project-path-for,qcom-camera)/QCamera2/HAL ifeq ($(TARGET_COMPILE_WITH_MSM_KERNEL),true) LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include @@ -92,7 +92,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 9ead9bd..ad00978 100644 --- a/camera/QCamera2/HAL/test/Android.mk +++ b/camera/QCamera2/HAL/test/Android.mk @@ -37,7 +37,7 @@ LOCAL_C_INCLUDES += \ external/skia/include/core \ external/skia/include/images \ $(TARGET_OUT_HEADERS)/qcom/display \ - hardware/qcom/camera/QCamera2/stack/common \ + $(call project-path-for,qcom-camera)/QCamera2/stack/common \ 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 cc6f440..3960dc5 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)/mm-core/inc \ system/media/camera/include \ LOCAL_CFLAGS += -DCAMERA_ION_HEAP_ID=ION_IOMMU_HEAP_ID diff --git a/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk b/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk index b42636c..d3328a7 100644 --- a/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk +++ b/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk @@ -19,7 +19,7 @@ endif LOCAL_CFLAGS += -DSYSTEM_HEADER_PREFIX=sys 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 @@ -62,7 +62,7 @@ endif LOCAL_CFLAGS += -DSYSTEM_HEADER_PREFIX=sys 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