Use qti kernel headers
Issue: FP3-A13#13
Change-Id: Ic49974766eab69d889b4c0213d68d50a6e953406
diff --git a/oem-recovery/Android.mk b/oem-recovery/Android.mk
index a1b9cef..8057d0e 100644
--- a/oem-recovery/Android.mk
+++ b/oem-recovery/Android.mk
@@ -20,20 +20,16 @@
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
LOCAL_STATIC_LIBRARIES += libedify libotautil libz
+LOCAL_HEADER_LIBRARIES += qti_kernel_headers
LOCAL_C_INCLUDES := bootable/recovery
include $(LIBION_HEADER_PATH_WRAPPER)
LOCAL_C_INCLUDES += $(LIBION_HEADER_PATHS)
-LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
-LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_SRC_FILES := gpt-utils.cpp dec.cpp oem-updater.cpp recovery-ufs-bsg.cpp
LOCAL_CFLAGS := -Wall
LOCAL_NOSANITIZE := cfi
ifeq ($(TARGET_HAS_GENERIC_KERNEL_HEADERS),true)
LOCAL_CFLAGS += -D_GENERIC_KERNEL_HEADERS
LOCAL_CFLAGS += -Wno-unused-parameter
-else ifeq ($(TARGET_COMPILE_WITH_MSM_KERNEL),true)
- LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
- LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
endif
LOCAL_SHARED_LIBRARIES += libion
LOCAL_MODULE := librecovery_updater_msm
@@ -44,18 +40,14 @@
LOCAL_C_INCLUDES := bootable/recovery
include $(LIBION_HEADER_PATH_WRAPPER)
LOCAL_C_INCLUDES += $(LIBION_HEADER_PATHS)
-LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
-LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_SRC_FILES := gpt-utils.cpp recovery-ufs-bsg.cpp
LOCAL_CFLAGS := -Wall
ifeq ($(TARGET_HAS_GENERIC_KERNEL_HEADERS),true)
LOCAL_CFLAGS += -D_GENERIC_KERNEL_HEADERS
-else ifeq ($(TARGET_COMPILE_WITH_MSM_KERNEL),true)
- LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
- LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
endif
LOCAL_SHARED_LIBRARIES += liblog libcutils libz libion
+LOCAL_HEADER_LIBRARIES += qti_kernel_headers
LOCAL_MODULE := librecovery_updater_msm
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
LOCAL_VENDOR_MODULE := true