darkkirb/android_device_lenovo_msm8937-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

land: camera: Use project pathmap

Browse source 
Change-Id: I90c00fa50deed656e21391b9d39a4821049359dd
This commit is contained in:
Zhao Wei Liew 2017-02-12 05:27:18 +08:00
parent 669d233045
commit beeb8314a2
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
camera/QCamera2/Android.mk
View file

@ -62,15 +62,15 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/util \ $(LOCAL_PATH)/util \
$(LOCAL_PATH)/HAL3 \ $(LOCAL_PATH)/HAL3 \
hardware/libhardware/include/hardware \ hardware/libhardware/include/hardware \
hardware/qcom/media/libstagefrighthw \ $(call project-path-for,qcom-media)/libstagefrighthw \
hardware/qcom/media/mm-core/inc \ $(call project-path-for,qcom-media)/mm-core/inc \
system/core/include/cutils \ system/core/include/cutils \
system/core/include/system \ system/core/include/system \
system/media/camera/include/system system/media/camera/include/system
#HAL 1.0 Include paths #HAL 1.0 Include paths
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
hardware/qcom/camera/QCamera2/HAL $(call project-path-for,qcom-camera)/QCamera2/HAL
ifeq ($(TARGET_COMPILE_WITH_MSM_KERNEL),true) ifeq ($(TARGET_COMPILE_WITH_MSM_KERNEL),true)
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
@ -92,7 +92,7 @@ endif
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
$(TARGET_OUT_HEADERS)/qcom/display $(TARGET_OUT_HEADERS)/qcom/display
LOCAL_C_INCLUDES += \ 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 := libcamera_client liblog libhardware libutils libcutils libdl libsync libgui
LOCAL_SHARED_LIBRARIES += libmmcamera_interface libmmjpeg_interface libui libcamera_metadata LOCAL_SHARED_LIBRARIES += libmmcamera_interface libmmjpeg_interface libui libcamera_metadata
LOCAL_SHARED_LIBRARIES += libqdMetaData libqservice libbinder LOCAL_SHARED_LIBRARIES += libqdMetaData libqservice libbinder

2
camera/QCamera2/HAL/test/Android.mk
View file

@ -37,7 +37,7 @@ LOCAL_C_INCLUDES += \
external/skia/include/core \ external/skia/include/core \
external/skia/include/images \ external/skia/include/images \
$(TARGET_OUT_HEADERS)/qcom/display \ $(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/av/include/media/stagefright \
frameworks/native/include/media/openmax \ frameworks/native/include/media/openmax \
$(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include

2
camera/QCamera2/stack/mm-camera-interface/Android.mk
View file

@ -36,7 +36,7 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/inc \ $(LOCAL_PATH)/inc \
$(LOCAL_PATH)/../common \ $(LOCAL_PATH)/../common \
hardware/libhardware/include/hardware \ hardware/libhardware/include/hardware \
hardware/qcom/media/mm-core/inc \ $(call project-path-for,qcom-media)/mm-core/inc \
system/media/camera/include \ system/media/camera/include \
LOCAL_CFLAGS += -DCAMERA_ION_HEAP_ID=ION_IOMMU_HEAP_ID LOCAL_CFLAGS += -DCAMERA_ION_HEAP_ID=ION_IOMMU_HEAP_ID

4
camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk
View file

@ -19,7 +19,7 @@ endif
LOCAL_CFLAGS += -DSYSTEM_HEADER_PREFIX=sys LOCAL_CFLAGS += -DSYSTEM_HEADER_PREFIX=sys
OMX_HEADER_DIR := frameworks/native/include/media/openmax 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)
LOCAL_C_INCLUDES += $(MM_JPEG_TEST_PATH)/../inc LOCAL_C_INCLUDES += $(MM_JPEG_TEST_PATH)/../inc
@ -62,7 +62,7 @@ endif
LOCAL_CFLAGS += -DSYSTEM_HEADER_PREFIX=sys LOCAL_CFLAGS += -DSYSTEM_HEADER_PREFIX=sys
OMX_HEADER_DIR := frameworks/native/include/media/openmax 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)
LOCAL_C_INCLUDES += $(MM_JPEG_TEST_PATH)/../inc LOCAL_C_INCLUDES += $(MM_JPEG_TEST_PATH)/../inc