Piteball
/
android_device_asus_flo
mirror of https://github.com/followmsi/android_device_asus_flo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

flo: Build camera HAL with kernel headers 

After removing the prebuilt kernel headers, we need to include
the kernel headers from source to fix the build.

Change-Id: I0e7074076db50032862ae4d8f001580405e9cd99
This commit is contained in:
Zhao Wei Liew 2016-01-31 14:23:46 +08:00
parent 07d8685e6d
commit aad4d16249
5 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
camera/QCamera2/HAL/Android.mk
View File

@ -37,6 +37,10 @@ LOCAL_C_INCLUDES := \
LOCAL_C_INCLUDES += \
$(call project-path-for,qcom-display)/libgralloc
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/media
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
LOCAL_SHARED_LIBRARIES := libcamera_client liblog libhardware libutils libcutils libdl
LOCAL_SHARED_LIBRARIES += libmmcamera_interface libmmjpeg_interface

4
camera/QCamera2/HAL3/Android.mk
View File

@ -30,6 +30,10 @@ LOCAL_C_INCLUDES := \
LOCAL_C_INCLUDES += \
$(call project-path-for,qcom-display)/libgralloc
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/media
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
LOCAL_SHARED_LIBRARIES := libcamera_client liblog libhardware libutils libcutils libdl
LOCAL_SHARED_LIBRARIES += libmmcamera_interface libmmjpeg_interface libui libcamera_metadata

4
camera/QCamera2/stack/mm-camera-interface/Android.mk
View File

@ -28,6 +28,10 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/inc \
$(LOCAL_PATH)/../common
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/media
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
LOCAL_C_INCLUDES += $(call project-path-for,qcom-media)/mm-core/inc
LOCAL_CFLAGS += -Wall -Werror

4
camera/QCamera2/stack/mm-camera-test/Android.mk
View File

@ -30,6 +30,10 @@ LOCAL_C_INCLUDES+= \
$(LOCAL_PATH)/../../../mm-image-codec/qexif \
$(LOCAL_PATH)/../../../mm-image-codec/qomx_core
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/media
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
LOCAL_CFLAGS += -DCAMERA_ION_HEAP_ID=ION_CP_MM_HEAP_ID
ifeq ($(call is-board-platform,msm8974),true)
LOCAL_CFLAGS += -DCAMERA_GRALLOC_HEAP_ID=GRALLOC_USAGE_PRIVATE_IOMMU_HEAP

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

@ -4,6 +4,10 @@ include $(CLEAR_VARS)
LOCAL_CFLAGS+= -D_ANDROID_
LOCAL_C_INCLUDES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/media
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
LOCAL_C_INCLUDES += \
frameworks/native/include/media/openmax \
$(LOCAL_PATH)/inc \