diff options
Diffstat (limited to 'camera/QCamera2/stack')
| -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 |
3 files changed, 3 insertions, 9 deletions
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 |