diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2020-06-16 20:33:27 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2020-06-16 20:33:27 -0700 |
| commit | 39aa2f93b36ac8b9c0f3db50cbd55133db0f2b6e (patch) | |
| tree | eb103743326766bcd4fc7f9aae20e75eff96a120 | |
| parent | 1cccb25308b566f727ed32880242ed4109927b70 (diff) | |
| parent | 85b8b98431f20ded1f454e018c30154875c5e904 (diff) | |
Merge 85b8b98431f20ded1f454e018c30154875c5e904 on remote branch
Change-Id: I86aae1461d8172ba5923a3144d2a3285cadb8ea5
| -rw-r--r-- | kernel_definitions.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel_definitions.mk b/kernel_definitions.mk index cdbbddc..6e8baf9 100644 --- a/kernel_definitions.mk +++ b/kernel_definitions.mk @@ -115,7 +115,7 @@ $(error Kernel configuration not defined, cannot build kernel) else ifeq ($(GKI_KERNEL),1) -GKI_PLATFORM_NAME := $(shell echo $(KERNEL_DEFCONFIG) | sed -r "s/(-gki_defconfig|-qgki_defconfig|-qgki-debug_defconfig)$///") +GKI_PLATFORM_NAME := $(shell echo $(KERNEL_DEFCONFIG) | sed -r "s/(-gki_defconfig|-qgki_defconfig|-qgki-consolidate_defconfig|-qgki-debug_defconfig)$///") 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) KERNEL_GENERATE_DEFCONFIG := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/configs/$(KERNEL_DEFCONFIG) |