Skip to content
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

xdroid: xdroid: Bump xdroid Release 17 #3

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

xdroid: xdroid: Bump xdroid Release 17 #3

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
94cdd5e
xdroid: kernel: Allow to override toolchain prefix used for vDSO32 bu…
NerdZ3ns Jun 25, 2022
4288c22
xdroid: kernel: Allow usage of custom LLVM binutils
cyberknight777 Jun 20, 2022
e3ee159
xdroid: xdroid: Bump xdroid Release 17
xyzuan Aug 7, 2022
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
34 changes: 18 additions & 16 deletions build/tasks/kernel.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,22 +231,6 @@ ifeq ($(TARGET_KERNEL_CLANG_COMPILE),true)
KERNEL_CLANG_VERSION := $(LLVM_PREBUILTS_VERSION)
endif

# As
ifeq ($(KERNEL_SUPPORTS_LLVM_TOOLS),true)
KERNEL_LD := LD=ld.lld
KERNEL_AR := AR=llvm-ar
KERNEL_OBJCOPY := OBJCOPY=llvm-objcopy
KERNEL_OBJDUMP := OBJDUMP=llvm-objdump
KERNEL_NM := NM=llvm-nm
KERNEL_STRIP := STRIP=llvm-strip
else
KERNEL_LD :=
KERNEL_AR :=
KERNEL_OBJCOPY :=
KERNEL_OBJDUMP :=
KERNEL_NM :=
KERNEL_STRIP :=
endif
TARGET_KERNEL_CLANG_PATH ?= $(BUILD_TOP)/prebuilts/clang/host/$(HOST_PREBUILT_TAG)/$(KERNEL_CLANG_VERSION)
ifeq ($(KERNEL_ARCH),arm64)
KERNEL_CLANG_TRIPLE ?= CLANG_TRIPLE=aarch64-linux-gnu-
Expand All @@ -264,6 +248,24 @@ ifeq ($(TARGET_KERNEL_CLANG_COMPILE),true)
endif
endif

# As
ifeq ($(KERNEL_SUPPORTS_LLVM_TOOLS),true)
LLVM_TOOLS ?= $(TARGET_KERNEL_CLANG_PATH)/bin
KERNEL_LD := LD=$(LLVM_TOOLS)/ld.lld
KERNEL_AR := AR=$(LLVM_TOOLS)/llvm-ar
KERNEL_OBJCOPY := OBJCOPY=$(LLVM_TOOLS)/llvm-objcopy
KERNEL_OBJDUMP := OBJDUMP=$(LLVM_TOOLS)/llvm-objdump
KERNEL_NM := NM=$(LLVM_TOOLS)/llvm-nm
KERNEL_STRIP := STRIP=$(LLVM_TOOLS)/llvm-strip
else
KERNEL_LD :=
KERNEL_AR :=
KERNEL_OBJCOPY :=
KERNEL_OBJDUMP :=
KERNEL_NM :=
KERNEL_STRIP :=
endif

ifneq ($(TARGET_KERNEL_MODULES),)
$(error TARGET_KERNEL_MODULES is no longer supported!)
endif
Expand Down
20 changes: 18 additions & 2 deletions config/BoardConfigKernel.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
# defaults to arm-linux-androidkernel- for arm
# aarch64-linux-android- for arm64
# x86_64-linux-android- for x86
# TARGET_KERNEL_CROSS_COMPILE_PREFIX_ARM32 = Compiler prefix for building vDSO32
# defaults to arm-linux-androidkernel-
#
# TARGET_KERNEL_CLANG_COMPILE = Compile kernel with clang, defaults to false
#
Expand Down Expand Up @@ -86,12 +88,26 @@ KERNEL_TOOLCHAIN ?= $(KERNEL_TOOLCHAIN_$(KERNEL_ARCH))
KERNEL_TOOLCHAIN_PREFIX ?= $(KERNEL_TOOLCHAIN_PREFIX_$(KERNEL_ARCH))
endif

TARGET_KERNEL_CROSS_COMPILE_PREFIX_ARM32 := $(strip $(TARGET_KERNEL_CROSS_COMPILE_PREFIX_ARM32))
ifneq ($(TARGET_KERNEL_CROSS_COMPILE_PREFIX_ARM32),)
KERNEL_TOOLCHAIN_PREFIX_ARM32 ?= $(TARGET_KERNEL_CROSS_COMPILE_PREFIX_ARM32)
else
KERNEL_TOOLCHAIN_ARM32 ?= $(KERNEL_TOOLCHAIN_arm)
KERNEL_TOOLCHAIN_PREFIX_ARM32 ?= $(KERNEL_TOOLCHAIN_PREFIX_arm)
endif

ifeq ($(KERNEL_TOOLCHAIN),)
KERNEL_TOOLCHAIN_PATH := $(KERNEL_TOOLCHAIN_PREFIX)
else
KERNEL_TOOLCHAIN_PATH := $(KERNEL_TOOLCHAIN)/$(KERNEL_TOOLCHAIN_PREFIX)
endif

ifeq ($(KERNEL_TOOLCHAIN_ARM32),)
KERNEL_TOOLCHAIN_PATH_ARM32 := $(KERNEL_TOOLCHAIN_PREFIX_ARM32)
else
KERNEL_TOOLCHAIN_PATH_ARM32 := $(KERNEL_TOOLCHAIN_ARM32)/$(KERNEL_TOOLCHAIN_PREFIX_ARM32)
endif

# We need to add GCC toolchain to the path no matter what
# for tools like `as`
KERNEL_TOOLCHAIN_PATH_gcc := $(KERNEL_TOOLCHAIN_$(KERNEL_ARCH))/$(KERNEL_TOOLCHAIN_PREFIX_$(KERNEL_ARCH))
Expand All @@ -111,8 +127,8 @@ endif

# Needed for CONFIG_COMPAT_VDSO, safe to set for all arm64 builds
ifeq ($(KERNEL_ARCH),arm64)
KERNEL_CROSS_COMPILE += CROSS_COMPILE_ARM32="$(KERNEL_TOOLCHAIN_arm)/$(KERNEL_TOOLCHAIN_PREFIX_arm)"
KERNEL_CROSS_COMPILE += CROSS_COMPILE_COMPAT="$(KERNEL_TOOLCHAIN_arm)/$(KERNEL_TOOLCHAIN_PREFIX_arm)"
KERNEL_CROSS_COMPILE += CROSS_COMPILE_ARM32="$(KERNEL_TOOLCHAIN_PATH_ARM32)"
KERNEL_CROSS_COMPILE += CROSS_COMPILE_COMPAT="$(KERNEL_TOOLCHAIN_PATH_ARM32)"
endif

# Clear this first to prevent accidental poisoning from env
Expand Down
2 changes: 1 addition & 1 deletion config/xd_version.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ ifndef XDROID_BUILD_TYPE
XDROID_BUILD_TYPE := REL
endif

XDROID_VERSION := r10
XDROID_VERSION := r17
XDROID_ANDROID := 12.1
XDROID_PLATFORM_RELEASE_OR_CODENAME := 12L
XDROID_REVISION := INA.XD.$(XDROID_ANDROID).$(XDROID_VERSION)-$(XDROID_GENID)-$(XDROID_BUILD).$(XDROID_BUILD_TYPE)
Expand Down