Revert "Replace old-style kernel headers only when building inline"

This reverts commit 84b2da3.
DerpFest-AOSP · Jan 20, 2024 · 76a576f · 76a576f
1 parent 0fa2843
commit 76a576f
Showing 1 changed file with 1 addition and 3 deletions.
diff --git 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,