From d034c3f7bb710af579fb4b525d23244c8d82d0cb Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Tue, 15 Sep 2020 11:06:18 +0200 Subject: [PATCH] lineage: Disable inline kernel building for generic {arm,arm64} targets Change-Id: I766779a2babc170481174899aaf610cbfeb8d754 --- build/target/product/lineage_arm.mk | 3 ++- build/target/product/lineage_arm64.mk | 4 +++- build/tasks/kernel.mk | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/build/target/product/lineage_arm.mk b/build/target/product/lineage_arm.mk index 97bbe3e2..90eb1edd 100644 --- a/build/target/product/lineage_arm.mk +++ b/build/target/product/lineage_arm.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2018-2019 The LineageOS Project +# Copyright (C) 2018-2020 The LineageOS Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,6 +16,7 @@ $(call inherit-product, build/target/product/aosp_arm.mk) include vendor/lineage/build/target/product/lineage_generic_target.mk +TARGET_NO_KERNEL_OVERRIDE := true TARGET_USES_64_BIT_BINDER := true PRODUCT_NAME := lineage_arm diff --git a/build/target/product/lineage_arm64.mk b/build/target/product/lineage_arm64.mk index b46c4e51..e57d8fdd 100644 --- a/build/target/product/lineage_arm64.mk +++ b/build/target/product/lineage_arm64.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2018-2019 The LineageOS Project +# Copyright (C) 2018-2020 The LineageOS Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,4 +16,6 @@ $(call inherit-product, build/target/product/aosp_arm64.mk) include vendor/lineage/build/target/product/lineage_generic_target.mk +TARGET_NO_KERNEL_OVERRIDE := true + PRODUCT_NAME := lineage_arm64 diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk index bdf264d4..983ffb78 100644 --- a/build/tasks/kernel.mk +++ b/build/tasks/kernel.mk @@ -63,6 +63,7 @@ # modules in vendor_overlay instead of vendor ifneq ($(TARGET_NO_KERNEL),true) +ifneq ($(TARGET_NO_KERNEL_OVERRIDE),true) ## Externally influenced variables KERNEL_SRC := $(TARGET_KERNEL_SOURCE) @@ -356,4 +357,5 @@ dtboimage: $(INSTALLED_DTBOIMAGE_TARGET) .PHONY: dtbimage dtbimage: $(INSTALLED_DTBIMAGE_TARGET) +endif # TARGET_NO_KERNEL_OVERRIDE endif # TARGET_NO_KERNEL