Skip to content

Commit 6afb476

Browse files
committed
angler: add kernel includes where needed for build
1 parent b059ede commit 6afb476

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

BoardConfig.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ TARGET_KERNEL_CONFIG := angler_defconfig
3737
BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb
3838
TARGET_NOT_USE_GZIP_RECOVERY_RAMDISK := true
3939

40+
TARGET_COMPILE_WITH_MSM_KERNEL := true
41+
4042
BOARD_KERNEL_BASE := 0x00000000
4143
BOARD_KERNEL_PAGESIZE := 4096
4244
BOARD_KERNEL_TAGS_OFFSET := 0x01E00000

camera/QCamera2/Android.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ LOCAL_C_INCLUDES += \
6464
frameworks/native/include/media/hardware \
6565
device/huawei/angler/camera/QCamera2/HAL
6666

67-
TARGET_HEADER_LIBRARIES := generated_kernel_headers
67+
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
68+
LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
6869

6970
#LOCAL_STATIC_LIBRARIES := libqcamera2_util
7071
LOCAL_C_INCLUDES += \

camera/common.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
common_deps :=
22
kernel_includes :=
33

4-
ifeq ($(call is-vendor-board-platform,QCOM),true)
4+
#ifeq ($(call is-vendor-board-platform,QCOM),true)
55
ifeq ($(TARGET_COMPILE_WITH_MSM_KERNEL),true)
66
common_deps += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
77
kernel_includes += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
88
endif
9-
endif
9+
#endif

0 commit comments

Comments
 (0)