Merge "kernel: Add 32-bit GCC to PATH for vdso32" into android-12

This commit is contained in:
bigbiff
2021-11-14 18:47:33 +00:00
committed by Gerrit Code Review
+7 -1
View File
@@ -127,10 +127,16 @@ ifneq ($(TARGET_KERNEL_ADDITIONAL_FLAGS),)
endif
TOOLS_PATH_OVERRIDE := \
PATH=$(BUILD_TOP)/prebuilts/tools-lineage/$(HOST_PREBUILT_TAG)/bin:$$PATH \
LD_LIBRARY_PATH=$(BUILD_TOP)/prebuilts/tools-lineage/$(HOST_PREBUILT_TAG)/lib:$$LD_LIBRARY_PATH \
PERL5LIB=$(BUILD_TOP)/prebuilts/tools-lineage/common/perl-base
ifeq ($(KERNEL_ARCH),arm64)
# Add 32-bit GCC to PATH so that arm-linux-androidkernel-as is available for CONFIG_COMPAT_VDSO
TOOLS_PATH_OVERRIDE += PATH=$(BUILD_TOP)/prebuilts/tools-lineage/$(HOST_PREBUILT_TAG)/bin:$(KERNEL_TOOLCHAIN_arm):$$PATH
else
TOOLS_PATH_OVERRIDE += PATH=$(BUILD_TOP)/prebuilts/tools-lineage/$(HOST_PREBUILT_TAG)/bin:$$PATH
endif
# Set DTBO image locations so the build system knows to build them
ifeq (true,$(filter true, $(TARGET_NEEDS_DTBOIMAGE) $(BOARD_KERNEL_SEPARATED_DTBO)))
BOARD_PREBUILT_DTBOIMAGE ?= $(TARGET_OUT_INTERMEDIATES)/DTBO_OBJ/arch/$(KERNEL_ARCH)/boot/dtbo.img