diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2020-09-08 01:07:01 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2020-09-08 01:07:01 -0700 |
| commit | 4467a050a88815d4c6db485d90e9e25f456e8a6c (patch) | |
| tree | 3c702b9147ef23c620424b306182f57c6fdaca1b | |
| parent | b72ef2c9b9ff682cb371b2ec2fab841dcb623650 (diff) | |
| parent | fcaa774961b2045893deb083137f995e176eec1c (diff) | |
Merge fcaa774961b2045893deb083137f995e176eec1c on remote branch
Change-Id: I21c8723f383a1afef23206ea5e9590072ba52573
| -rw-r--r-- | kernel_definitions.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel_definitions.mk b/kernel_definitions.mk index b0e14ab..cd973e3 100644 --- a/kernel_definitions.mk +++ b/kernel_definitions.mk @@ -124,7 +124,7 @@ GKI_PLATFORM_NAME := $(shell echo $(GKI_PLATFORM_NAME) | sed "s/vendor\///g") TARGET_USES_UNCOMPRESSED_KERNEL := $(shell grep "CONFIG_BUILD_ARM64_UNCOMPRESSED_KERNEL=y" $(TARGET_KERNEL_SOURCE)/arch/arm64/configs/vendor/$(GKI_PLATFORM_NAME)_GKI.config) # Generate the defconfig file from the fragments -_x := $(shell ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) KERN_OUT=$(KERNEL_OUT) $(TARGET_KERNEL_MAKE_ENV) MAKE_PATH=$(MAKE_PATH) $(TARGET_KERNEL_SOURCE)/scripts/gki/generate_defconfig.sh $(KERNEL_DEFCONFIG)) +_x := $(shell ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) KERN_OUT=$(KERNEL_OUT) $(TARGET_KERNEL_MAKE_ENV) MAKE_PATH=$(MAKE_PATH) TARGET_BUILD_VARIANT=${TARGET_BUILD_VARIANT} $(TARGET_KERNEL_SOURCE)/scripts/gki/generate_defconfig.sh $(KERNEL_DEFCONFIG)) else TARGET_USES_UNCOMPRESSED_KERNEL := $(shell grep "CONFIG_BUILD_ARM64_UNCOMPRESSED_KERNEL=y" $(TARGET_KERNEL_SOURCE)/arch/arm64/configs/$(KERNEL_DEFCONFIG)) endif @@ -176,7 +176,7 @@ ifeq ($(GKI_KERNEL),1) BOARD_KERNEL-GKI_BOOTIMAGE_PARTITION_SIZE := 0x06000000 # Generate the GKI defconfig - _x := $(shell ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) KERN_OUT=$(KERNEL_OUT) $(TARGET_KERNEL_MAKE_ENV) MAKE_PATH=$(MAKE_PATH) $(TARGET_KERNEL_SOURCE)/scripts/gki/generate_defconfig.sh $(GKI_KERNEL_DEFCONFIG)) + _x := $(shell ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) KERN_OUT=$(KERNEL_OUT) $(TARGET_KERNEL_MAKE_ENV) MAKE_PATH=$(MAKE_PATH) TARGET_BUILD_VARIANT=${TARGET_BUILD_VARIANT} $(TARGET_KERNEL_SOURCE)/scripts/gki/generate_defconfig.sh $(GKI_KERNEL_DEFCONFIG)) endif endif |