diff options
| author | Bruno Martins <bgcngm@gmail.com> | 2018-10-29 12:37:02 +0000 |
|---|---|---|
| committer | Davide Garberi <dade.garberi@gmail.com> | 2018-11-02 15:23:13 +0100 |
| commit | 4e5917ff7c04568bd648939c36236678136047c7 (patch) | |
| tree | f4b22aca7ad53a2ef7ea91f94cad78ca5f403d4a /camera | |
| parent | 93dc1972c32b68ea256c6bf67db196a4036f3c7a (diff) | |
msm8996-common: camera: Use generated kernel headers
Change-Id: I1508ce54fd99e87f2857e6c6141d5e90f5e9892b
Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/QCamera2/Android.mk | 5 | ||||
| -rw-r--r-- | camera/QCamera2/stack/mm-camera-interface/Android.mk | 4 | ||||
| -rw-r--r-- | camera/QCamera2/stack/mm-jpeg-interface/Android.mk | 4 | ||||
| -rw-r--r-- | camera/QCamera2/stack/mm-lib2d-interface/Android.mk | 4 | ||||
| -rw-r--r-- | camera/common.mk | 7 |
5 files changed, 5 insertions, 19 deletions
diff --git a/camera/QCamera2/Android.mk b/camera/QCamera2/Android.mk index 6cf13a0..0243053 100644 --- a/camera/QCamera2/Android.mk +++ b/camera/QCamera2/Android.mk @@ -81,8 +81,7 @@ LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/HAL -LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include -LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr +LOCAL_HEADER_LIBRARIES := generated_kernel_headers ifeq ($(TARGET_TS_MAKEUP),true) LOCAL_CFLAGS += -DTARGET_TS_MAKEUP LOCAL_C_INCLUDES += $(LOCAL_PATH)/HAL/tsMakeuplib/include @@ -106,7 +105,7 @@ LOCAL_SHARED_LIBRARIES += libqdMetaData libqservice libbinder ifeq ($(TARGET_TS_MAKEUP),true) LOCAL_SHARED_LIBRARIES += libts_face_beautify_hal libts_detected_face_hal endif -LOCAL_HEADER_LIBRARIES := media_plugin_headers +LOCAL_HEADER_LIBRARIES += media_plugin_headers LOCAL_STATIC_LIBRARIES := android.hardware.camera.common@1.0-helper diff --git a/camera/QCamera2/stack/mm-camera-interface/Android.mk b/camera/QCamera2/stack/mm-camera-interface/Android.mk index c3c9f8f..9b96326 100644 --- a/camera/QCamera2/stack/mm-camera-interface/Android.mk +++ b/camera/QCamera2/stack/mm-camera-interface/Android.mk @@ -1,7 +1,6 @@ OLD_LOCAL_PATH := $(LOCAL_PATH) LOCAL_PATH := $(call my-dir) -include $(LOCAL_PATH)/../../../common.mk include $(CLEAR_VARS) MM_CAM_FILES := \ @@ -40,8 +39,6 @@ LOCAL_C_INCLUDES := \ system/media/camera/include \ LOCAL_CFLAGS += -DCAMERA_ION_HEAP_ID=ION_IOMMU_HEAP_ID -LOCAL_C_INCLUDES+= $(kernel_includes) -LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) ifneq (1,$(filter 1,$(shell echo "$$(( $(PLATFORM_SDK_VERSION) >= 17 ))" ))) LOCAL_CFLAGS += -include bionic/libc/kernel/common/linux/socket.h @@ -56,6 +53,7 @@ LOCAL_MODULE := libmmcamera_interface LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := libdl libcutils liblog libutils LOCAL_HEADER_LIBRARIES := libsystem_headers libhardware_headers +LOCAL_HEADER_LIBRARIES += generated_kernel_headers LOCAL_MODULE_TAGS := optional LOCAL_VENDOR_MODULE := true diff --git a/camera/QCamera2/stack/mm-jpeg-interface/Android.mk b/camera/QCamera2/stack/mm-jpeg-interface/Android.mk index 035979d..3a3a1c6 100644 --- a/camera/QCamera2/stack/mm-jpeg-interface/Android.mk +++ b/camera/QCamera2/stack/mm-jpeg-interface/Android.mk @@ -1,7 +1,6 @@ OLD_LOCAL_PATH := $(LOCAL_PATH) LOCAL_PATH := $(call my-dir) -include $(LOCAL_PATH)/../../../common.mk include $(CLEAR_VARS) LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) @@ -9,8 +8,7 @@ LOCAL_CFLAGS+= -D_ANDROID_ -DQCAMERA_REDEFINE_LOG LOCAL_CFLAGS += -Wall -Wextra -Werror -Wno-unused-parameter -LOCAL_C_INCLUDES+= $(kernel_includes) -LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) +LOCAL_HEADER_LIBRARIES := generated_kernel_headers LIB2D_ROTATION=false diff --git a/camera/QCamera2/stack/mm-lib2d-interface/Android.mk b/camera/QCamera2/stack/mm-lib2d-interface/Android.mk index e963b69..9f72f45 100644 --- a/camera/QCamera2/stack/mm-lib2d-interface/Android.mk +++ b/camera/QCamera2/stack/mm-lib2d-interface/Android.mk @@ -1,7 +1,6 @@ OLD_LOCAL_PATH := $(LOCAL_PATH) LOCAL_PATH := $(call my-dir) -include $(LOCAL_PATH)/../../../common.mk include $(CLEAR_VARS) LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) @@ -9,8 +8,7 @@ LOCAL_CFLAGS+= -D_ANDROID_ -DQCAMERA_REDEFINE_LOG LOCAL_CFLAGS += -Wall -Wextra -Werror -Wno-unused-parameter -LOCAL_C_INCLUDES+= $(kernel_includes) -LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) +LOCAL_HEADER_LIBRARIES := generated_kernel_headers IMGLIB_HEADER_PATH := $(TARGET_OUT_INTERMEDIATES)/include/mm-camera/imglib diff --git a/camera/common.mk b/camera/common.mk deleted file mode 100644 index be8799b..0000000 --- a/camera/common.mk +++ /dev/null @@ -1,7 +0,0 @@ -common_deps := -kernel_includes := - -ifeq ($(call is-vendor-board-platform,QCOM),true) - common_deps += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr - kernel_includes += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include -endif |