Skip to content

Commit 1fb09d9

Browse files
Rashed97techyminati
authored andcommitted
build: Automatically replace old-style kernel header includes with new header lib
This is a combination of 3 commits. This is the 1st commit message: build: add kernel header dependency if module uses kernel headers Many of the QCOM components use kernel headers, but don't declare the dependency on them. This is fine in CAF because of the way they build the boot.img before anything else. In CM, we don't build the boot.img the same, so we run into a race between the kernel build & these modules... and the modules lose. Warn about modules that have this missing dependency, and add it for them so we don't have to modify each Android.mk. Change-Id: I95f1e47b5ef440f6f5d8f64a0c3f38d9572e839e ============================================================================ This is the commit message #2: build: Switch kernel header inclusion The build is switching to the target INSTALLED_KERNEL_HEADERS to declare dependencies on kernel headers. Change-Id: I913e74681b02dfcf1eaed3d1e47ff4ab2300b12d ============================================================================ This is the commit message #3: build: Automatically replace old-style kernel header includes with new header lib Since we do this via soong and the result is a header library, just replace all legacy include paths that point to the old header location with calls to the new header library. Since we no longer have the legacy include, we can also remove the additional dependency. This reverts commit fa798218e5b7f96e12ab3acc9d47a3f26a140777. Change-Id: I716955534e50831e6568ca01e480aa8b90075d92
1 parent 390553b commit 1fb09d9

File tree

1 file changed

+20
-0
lines changed

1 file changed

+20
-0
lines changed

core/binary.mk

+20
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,26 @@ endif
4444

4545
my_soong_problems :=
4646

47+
# Automatically replace the old-style kernel header include with a dependency
48+
# on the generated_kernel_headers header library
49+
ifneq (,$(findstring $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include,$(LOCAL_C_INCLUDES)))
50+
LOCAL_C_INCLUDES := $(patsubst $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include,,$(LOCAL_C_INCLUDES))
51+
LOCAL_HEADER_LIBRARIES += generated_kernel_headers
52+
endif
53+
54+
# Some qcom binaries use this weird -isystem include...
55+
ifneq (,$(findstring $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include,$(LOCAL_CFLAGS)))
56+
LOCAL_CFLAGS := $(patsubst -isystem $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include,,$(LOCAL_CFLAGS))
57+
LOCAL_HEADER_LIBRARIES += generated_kernel_headers
58+
endif
59+
60+
# Remove KERNEL_OBJ/usr from any LOCAL_ADDITIONAL_DEPENDENCIES, we will
61+
# just include generated_kernel_headers which already has the proper
62+
# dependency
63+
ifneq (,$(findstring $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr,$(LOCAL_ADDITIONAL_DEPENDENCIES)))
64+
LOCAL_ADDITIONAL_DEPENDENCIES := $(patsubst $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr,,$(LOCAL_ADDITIONAL_DEPENDENCIES))
65+
endif
66+
4767
# The following LOCAL_ variables will be modified in this file.
4868
# Because the same LOCAL_ variables may be used to define modules for both 1st arch and 2nd arch,
4969
# we can't modify them in place.

0 commit comments

Comments
 (0)