From 76a576f6a3aa74bd01eafd623f8223e12c3cff46 Mon Sep 17 00:00:00 2001 From: klozz Date: Sat, 20 Jan 2024 02:46:54 +0100 Subject: [PATCH] Revert "Replace old-style kernel headers only when building inline" This reverts commit 84b2da3e5ea477156bc8c59ace1b7a360315cdb0. --- core/binary.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/binary.mk b/core/binary.mk index d579906c9c1..0b3deeba245 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -45,8 +45,7 @@ endif my_soong_problems := # Automatically replace the old-style kernel header include with a dependency -# on the generated_kernel_headers header library when building inline -ifeq ($(INLINE_KERNEL_BUILDING),true) +# on the generated_kernel_headers header library ifneq (,$(findstring $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include,$(LOCAL_C_INCLUDES))) LOCAL_C_INCLUDES := $(patsubst $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include,,$(LOCAL_C_INCLUDES)) LOCAL_HEADER_LIBRARIES += generated_kernel_headers @@ -64,7 +63,6 @@ endif ifneq (,$(findstring $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr,$(LOCAL_ADDITIONAL_DEPENDENCIES))) LOCAL_ADDITIONAL_DEPENDENCIES := $(patsubst $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr,,$(LOCAL_ADDITIONAL_DEPENDENCIES)) endif -endif # The following LOCAL_ variables will be modified in this file. # Because the same LOCAL_ variables may be used to define modules for both 1st arch and 2nd arch,