shamu: camera: Use generated kernel headers

Change-Id: I1508ce54fd99e87f2857e6c6141d5e90f5e9892b
Signed-off-by: Albert I <krascgq@outlook.co.id>
Signed-off-by: Elektroschmock <elektroschmock78@googlemail.com>

6 files changed, 6 insertions, 18 deletions

diff --git a/camera/QCamera2/Android.mk b/camera/QCamera2/Android.mk
index a8673ccb..f53a8a8c 100644
--- a/camera/QCamera2/Android.mk
+++ b/camera/QCamera2/Android.mk
@@ -65,8 +65,7 @@ LOCAL_C_INCLUDES += \
     frameworks/native/include/media/hardware \
     device/moto/shamu/camera/QCamera2/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
 
 #LOCAL_STATIC_LIBRARIES := libqcamera2_util
 LOCAL_C_INCLUDES += \
diff --git a/camera/QCamera2/stack/mm-camera-interface/Android.mk b/camera/QCamera2/stack/mm-camera-interface/Android.mk
index 539d82bf..dc28bcf0 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)
 
 # cam_intf.c has type conversion discarding qualifiers.
@@ -36,8 +35,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../common \
     system/media/camera/include
 
-LOCAL_C_INCLUDES += $(kernel_includes)
-LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
+LOCAL_HEADER_LIBRARIES := generated_kernel_headers
 
 LOCAL_C_INCLUDES += $(call project-path-for,qcom-media)/mm-core/inc
 
diff --git a/camera/QCamera2/stack/mm-camera-test/Android.mk b/camera/QCamera2/stack/mm-camera-test/Android.mk
index afbfd36b..d970f430 100644
--- a/camera/QCamera2/stack/mm-camera-test/Android.mk
+++ b/camera/QCamera2/stack/mm-camera-test/Android.mk
@@ -2,7 +2,6 @@ OLD_LOCAL_PATH := $(LOCAL_PATH)
 LOCAL_PATH := $(call my-dir)
 
 # Build command line test app: mm-qcamera-app
-include $(LOCAL_PATH)/../../../common.mk
 include $(CLEAR_VARS)
 
 LOCAL_CFLAGS := \
@@ -100,8 +99,7 @@ LOCAL_C_INCLUDES+= \
         $(LOCAL_PATH)/../../../mm-image-codec/qexif \
         $(LOCAL_PATH)/../../../mm-image-codec/qomx_core
 
-LOCAL_C_INCLUDES+= $(kernel_includes)
-LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
+LOCAL_HEADER_LIBRARIES := generated_kernel_headers
 
 LOCAL_CFLAGS += -DCAMERA_ION_HEAP_ID=ION_IOMMU_HEAP_ID
 LOCAL_CFLAGS += -DCAMERA_GRALLOC_HEAP_ID=GRALLOC_USAGE_PRIVATE_IOMMU_HEAP
diff --git a/camera/QCamera2/stack/mm-jpeg-interface/Android.mk b/camera/QCamera2/stack/mm-jpeg-interface/Android.mk
index 1d3cb36a..e8cf90c2 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 := true
@@ -12,8 +11,7 @@ LOCAL_CFLAGS += \
     -Wall \
     -Werror
 
-LOCAL_C_INCLUDES+= $(kernel_includes)
-LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
+LOCAL_HEADER_LIBRARIES := generated_kernel_headers
 
 LOCAL_C_INCLUDES += \
     frameworks/native/include/media/openmax \
diff --git a/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk b/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk
index 03b29927..ebe2e26e 100644
--- a/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk
+++ b/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk
@@ -2,7 +2,6 @@
 OLD_LOCAL_PATH := $(LOCAL_PATH)
 MM_JPEG_TEST_PATH := $(call my-dir)
 
-include $(LOCAL_PATH)/../../common.mk
 include $(CLEAR_VARS)
 LOCAL_PATH := $(MM_JPEG_TEST_PATH)
 LOCAL_MODULE_TAGS := optional
@@ -23,8 +22,7 @@ LOCAL_C_INCLUDES += $(OMX_HEADER_DIR)
 LOCAL_C_INCLUDES += $(OMX_CORE_DIR)/qexif
 LOCAL_C_INCLUDES += $(OMX_CORE_DIR)/qomx_core
 
-LOCAL_C_INCLUDES += $(kernel_includes)
-LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
+LOCAL_HEADER_LIBRARIES := generated_kernel_headers
 
 LOCAL_SRC_FILES := mm_jpeg_test.c
 
@@ -67,8 +65,7 @@ LOCAL_C_INCLUDES := \
     $(OMX_CORE_DIR)/qexif \
     $(OMX_CORE_DIR)/qomx_core
 
-LOCAL_C_INCLUDES += $(kernel_includes)
-LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
+LOCAL_HEADER_LIBRARIES := generated_kernel_headers
 
 LOCAL_SRC_FILES := mm_jpegdec_test.c
 
diff --git a/camera/common.mk b/camera/common.mk
deleted file mode 100644
index 6d698d01..00000000
--- a/camera/common.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-common_deps += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
-kernel_includes += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include