Skip to content

Fix GKI building #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Klozz wants to merge 3 commits into
base: 14
Choose a base branch
from
Open

Fix GKI building #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4315ad9
Revert "Replace device_kernel_headers with generated_kernel_headers"
Klozz Jan 20, 2024
c1b7830
Revert "envsetup: Set INLINE_KERNEL_BUILDING if TARGET_PREBUILT_KERNE…
Klozz Jan 20, 2024
7fa742d
Revert "Replace old-style kernel headers only when building inline"
Klozz Jan 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions core/binary.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -65,12 +64,6 @@ ifneq (,$(findstring $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr,$(LOCAL_ADDITION
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.
# Because the same LOCAL_ variables may be used to define modules for both 1st arch and 2nd arch,
# we can't modify them in place.
Expand Down
7 changes: 0 additions & 7 deletions envsetup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down