From 4315ad9ab22bc33f8c5d0c020582411f3b19e86c Mon Sep 17 00:00:00 2001 From: klozz Date: Sat, 20 Jan 2024 02:46:39 +0100 Subject: [PATCH 1/3] Revert "Replace device_kernel_headers with generated_kernel_headers" This reverts commit b1a3b6f9ddef1e385e7d36e9d78ccdbfe38794da. --- core/binary.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/core/binary.mk b/core/binary.mk index 5d02b95e660..a07eb0e965d 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -64,11 +64,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 - -# Replace device_kernel_headers with generated_kernel_headers -ifneq (,$(findstring device_kernel_headers,$(LOCAL_HEADER_LIBRARIES))) - LOCAL_HEADER_LIBRARIES := $(patsubst device_kernel_headers,generated_kernel_headers,$(LOCAL_HEADER_LIBRARIES)) -endif endif # The following LOCAL_ variables will be modified in this file. From c1b7830763da303e7a630302fe93b3ba8d2ac4f0 Mon Sep 17 00:00:00 2001 From: klozz Date: Sat, 20 Jan 2024 02:46:45 +0100 Subject: [PATCH 2/3] Revert "envsetup: Set INLINE_KERNEL_BUILDING if TARGET_PREBUILT_KERNEL is set" This reverts commit f82e56e1b372cdd520f125ae88fcb24c7b676254. --- envsetup.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/envsetup.sh b/envsetup.sh index 901c5ca1d67..ffde112567c 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -866,13 +866,6 @@ function lunch() cd - > /dev/null fi - local prebuilt_kernel=$(get_build_var TARGET_PREBUILT_KERNEL) - if [ -z "$prebuilt_kernel" ]; then - export INLINE_KERNEL_BUILDING=true - else - unset INLINE_KERNEL_BUILDING - fi - [[ -n "${ANDROID_QUIET_BUILD:-}" ]] || echo fixup_common_out_dir From 7fa742dd71f0a003f5a8ee07426d9ec78fb50543 Mon Sep 17 00:00:00 2001 From: klozz Date: Sat, 20 Jan 2024 02:46:54 +0100 Subject: [PATCH 3/3] 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 a07eb0e965d..a797c807a67 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,