vendor/bliss: Update patches for pie-gsi merge
Signed-off-by: Jackeagle <jackeagle102@gmail.com>
diff --git a/patches/vendor/bliss/0001-Revert-verity_tool-Implement-status-getter.patch b/patches/vendor/bliss/0001-Revert-verity_tool-Implement-status-getter.patch
index 9565555..4fd8791 100644
--- a/patches/vendor/bliss/0001-Revert-verity_tool-Implement-status-getter.patch
+++ b/patches/vendor/bliss/0001-Revert-verity_tool-Implement-status-getter.patch
@@ -1,4 +1,4 @@
-From 3f9a9d9c86cb260124124afd8938c6715236098c Mon Sep 17 00:00:00 2001
+From 8ec2835b3f921b6f21868e2b61b23d8ff8889a72 Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
Date: Mon, 3 Dec 2018 10:55:28 -0500
Subject: [PATCH 01/17] Revert "verity_tool: Implement status getter"
diff --git a/patches/vendor/bliss/0002-Revert-kernel-Remove-kernel-x-config.patch b/patches/vendor/bliss/0002-Revert-kernel-Remove-kernel-x-config.patch
index 185bc38..32e9a4c 100644
--- a/patches/vendor/bliss/0002-Revert-kernel-Remove-kernel-x-config.patch
+++ b/patches/vendor/bliss/0002-Revert-kernel-Remove-kernel-x-config.patch
@@ -1,4 +1,4 @@
-From 68745b9d232ae2ad1204401833727c00063138b4 Mon Sep 17 00:00:00 2001
+From 62a3784faec82ee3693c3fe79719a12c2e400e2f Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
Date: Mon, 3 Dec 2018 10:55:52 -0500
Subject: [PATCH 02/17] Revert "kernel: Remove kernel{x}config"
@@ -9,7 +9,7 @@
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
-index aaa6b6cd..a6642534 100644
+index de5a7988..b4849a98 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -262,7 +262,18 @@ kerneltags: $(KERNEL_CONFIG)
diff --git a/patches/vendor/bliss/0003-Revert-kernel-Remove-deprecated-flag-errors.patch b/patches/vendor/bliss/0003-Revert-kernel-Remove-deprecated-flag-errors.patch
index 5efc507..a504f25 100644
--- a/patches/vendor/bliss/0003-Revert-kernel-Remove-deprecated-flag-errors.patch
+++ b/patches/vendor/bliss/0003-Revert-kernel-Remove-deprecated-flag-errors.patch
@@ -1,4 +1,4 @@
-From 6b43f50eb7ce1e8d2f3a5d10659049910cf9845f Mon Sep 17 00:00:00 2001
+From 6739dd5a2d9f507fac4f4e8de9fb48ddb0ffe84b Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
Date: Mon, 3 Dec 2018 10:56:00 -0500
Subject: [PATCH 03/17] Revert "kernel: Remove deprecated flag errors"
@@ -9,7 +9,7 @@
1 file changed, 6 insertions(+)
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
-index a6642534..9c798d68 100644
+index b4849a98..2729fef3 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -77,6 +77,12 @@ KERNEL_DEFCONFIG_SRC := $(KERNEL_SRC)/arch/$(KERNEL_DEFCONFIG_ARCH)/configs/$(KE
diff --git a/patches/vendor/bliss/0004-Revert-vendor-bliss-Remove-kernel.mk-headers-generat.patch b/patches/vendor/bliss/0004-Revert-vendor-bliss-Remove-kernel.mk-headers-generat.patch
index e7b2099..ebff61e 100644
--- a/patches/vendor/bliss/0004-Revert-vendor-bliss-Remove-kernel.mk-headers-generat.patch
+++ b/patches/vendor/bliss/0004-Revert-vendor-bliss-Remove-kernel.mk-headers-generat.patch
@@ -1,4 +1,4 @@
-From a8351307b800908f687ddf5af9d76db797ad74b1 Mon Sep 17 00:00:00 2001
+From 275ba11295668519a21bb051214f3ba8dba1a7dc Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
Date: Mon, 3 Dec 2018 10:56:07 -0500
Subject: [PATCH 04/17] Revert "vendor/bliss: Remove kernel.mk headers
@@ -10,7 +10,7 @@
1 file changed, 50 insertions(+)
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
-index 9c798d68..eeba2c0d 100644
+index 2729fef3..02f6d220 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -151,6 +151,9 @@ endif
diff --git a/patches/vendor/bliss/0005-Revert-vendor-bliss-Add-techpack-audio-to-include-pa.patch b/patches/vendor/bliss/0005-Revert-vendor-bliss-Add-techpack-audio-to-include-pa.patch
index b7b6080..4910da9 100644
--- a/patches/vendor/bliss/0005-Revert-vendor-bliss-Add-techpack-audio-to-include-pa.patch
+++ b/patches/vendor/bliss/0005-Revert-vendor-bliss-Add-techpack-audio-to-include-pa.patch
@@ -1,4 +1,4 @@
-From f3436b1722f4271e951cb9321193a84d7d1854d6 Mon Sep 17 00:00:00 2001
+From 783f3d6c490ce524063528ed4ba51a7280a8c62d Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
Date: Mon, 3 Dec 2018 10:56:58 -0500
Subject: [PATCH 05/17] Revert "vendor/bliss: Add techpack/audio to include
diff --git a/patches/vendor/bliss/0006-Revert-vendor-bliss-Dynamically-generate-kernel-head.patch b/patches/vendor/bliss/0006-Revert-vendor-bliss-Dynamically-generate-kernel-head.patch
index add6b1e..7dd9869 100644
--- a/patches/vendor/bliss/0006-Revert-vendor-bliss-Dynamically-generate-kernel-head.patch
+++ b/patches/vendor/bliss/0006-Revert-vendor-bliss-Dynamically-generate-kernel-head.patch
@@ -1,4 +1,4 @@
-From dc1368db839b143fa6475bbfd03d9653fdb18ee5 Mon Sep 17 00:00:00 2001
+From 781ad39aa4376edfad9a1c22967fb10928d03b0f Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
Date: Mon, 3 Dec 2018 10:57:02 -0500
Subject: [PATCH 06/17] Revert "vendor/bliss: Dynamically generate kernel
diff --git a/patches/vendor/bliss/0007-Revert-vendor-bliss-Add-soong-generator-module-type.patch b/patches/vendor/bliss/0007-Revert-vendor-bliss-Add-soong-generator-module-type.patch
index 3785542..1eabf86 100644
--- a/patches/vendor/bliss/0007-Revert-vendor-bliss-Add-soong-generator-module-type.patch
+++ b/patches/vendor/bliss/0007-Revert-vendor-bliss-Add-soong-generator-module-type.patch
@@ -1,4 +1,4 @@
-From 31ddd59654c1e4cbef68e60ca8cf59f05a374a44 Mon Sep 17 00:00:00 2001
+From 94351db55a8e644d7c162d44031b198c50a498ab Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
Date: Mon, 3 Dec 2018 10:57:16 -0500
Subject: [PATCH 07/17] Revert "vendor/bliss: Add soong generator module type"
diff --git a/patches/vendor/bliss/0008-Revert-soong_config-Add-flag-for-crypto-waiting-on-Q.patch b/patches/vendor/bliss/0008-Revert-soong_config-Add-flag-for-crypto-waiting-on-Q.patch
index f19d810..19a796b 100644
--- a/patches/vendor/bliss/0008-Revert-soong_config-Add-flag-for-crypto-waiting-on-Q.patch
+++ b/patches/vendor/bliss/0008-Revert-soong_config-Add-flag-for-crypto-waiting-on-Q.patch
@@ -1,4 +1,4 @@
-From 9cd22c7495ff6865ec764ac83ce49c7bfda86fc4 Mon Sep 17 00:00:00 2001
+From 6f3d8131beeb07a7feb9e99987018f6f29493ee1 Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
Date: Wed, 19 Dec 2018 17:06:59 +0100
Subject: [PATCH 08/17] Revert "soong_config: Add flag for crypto waiting on
diff --git a/patches/vendor/bliss/0009-Revert-soong_config-Add-flag-for-legacy-HW-FDE.patch b/patches/vendor/bliss/0009-Revert-soong_config-Add-flag-for-legacy-HW-FDE.patch
index b775e70..18d94b9 100644
--- a/patches/vendor/bliss/0009-Revert-soong_config-Add-flag-for-legacy-HW-FDE.patch
+++ b/patches/vendor/bliss/0009-Revert-soong_config-Add-flag-for-legacy-HW-FDE.patch
@@ -1,4 +1,4 @@
-From d45a6046c187c16f912d6250d0bd7dae0e06e83e Mon Sep 17 00:00:00 2001
+From 68de4a47218f81cb6d2e75d48d497e0448a8ee15 Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
Date: Wed, 19 Dec 2018 17:07:12 +0100
Subject: [PATCH 09/17] Revert "soong_config: Add flag for legacy HW FDE"
diff --git a/patches/vendor/bliss/0010-Revert-kernel-Fix-modules-path-generated-in-modules..patch b/patches/vendor/bliss/0010-Revert-kernel-Fix-modules-path-generated-in-modules..patch
new file mode 100644
index 0000000..77711f8
--- /dev/null
+++ b/patches/vendor/bliss/0010-Revert-kernel-Fix-modules-path-generated-in-modules..patch
@@ -0,0 +1,27 @@
+From 35cbda228d89bd7fc716cd0b0ce70c7ce7008781 Mon Sep 17 00:00:00 2001
+From: Jackeagle <jackeagle102@gmail.com>
+Date: Mon, 6 May 2019 20:01:30 +0200
+Subject: [PATCH 10/17] Revert "kernel: Fix modules path generated in
+ modules.dep"
+
+This reverts commit 14eee4e68b90effa47a74c455d5d79511e04cb05.
+---
+ build/tasks/kernel.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
+index 02f6d220..eeba2c0d 100644
+--- a/build/tasks/kernel.mk
++++ b/build/tasks/kernel.mk
+@@ -259,7 +259,7 @@ INSTALLED_KERNEL_MODULES: depmod-host
+ for f in $$modules; do \
+ $(KERNEL_TOOLCHAIN_PATH)strip --strip-unneeded $$f; \
+ done; \
+- ($(call build-image-kernel-modules,$$modules,$(KERNEL_MODULES_OUT),$(KERNEL_MODULE_MOUNTPOINT)/,$(KERNEL_DEPMOD_STAGING_DIR))); \
++ ($(call build-image-kernel-modules,$$modules,$(KERNEL_MODULES_OUT),$(KERNEL_MODULE_MOUNTPOINT),$(KERNEL_DEPMOD_STAGING_DIR))); \
+ fi
+
+ $(TARGET_KERNEL_MODULES): TARGET_KERNEL_BINARIES
+--
+2.21.0
+
diff --git a/patches/vendor/bliss/0010-Revert-kernel-Use-build-image-kernel-modules-instead.patch b/patches/vendor/bliss/0011-Revert-kernel-Use-build-image-kernel-modules-instead.patch
similarity index 95%
rename from patches/vendor/bliss/0010-Revert-kernel-Use-build-image-kernel-modules-instead.patch
rename to patches/vendor/bliss/0011-Revert-kernel-Use-build-image-kernel-modules-instead.patch
index 489c20e..0a11ce6 100644
--- a/patches/vendor/bliss/0010-Revert-kernel-Use-build-image-kernel-modules-instead.patch
+++ b/patches/vendor/bliss/0011-Revert-kernel-Use-build-image-kernel-modules-instead.patch
@@ -1,7 +1,7 @@
-From 51c9997f5ec7f6735480441b045a129dc327416f Mon Sep 17 00:00:00 2001
+From ef557446666508cf3b63dfa01458104e9e16bd18 Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
-Date: Fri, 3 May 2019 14:49:16 +0200
-Subject: [PATCH 10/17] Revert "kernel: Use build-image-kernel-modules instead
+Date: Mon, 6 May 2019 20:01:39 +0200
+Subject: [PATCH 11/17] Revert "kernel: Use build-image-kernel-modules instead
of copying it"
This reverts commit dbda78c5e62807ec700be086216d5e2cbb28330f.
diff --git a/patches/vendor/bliss/0011-Revert-kernel-Use-a-macro-for-kernel-build-targets.patch b/patches/vendor/bliss/0012-Revert-kernel-Use-a-macro-for-kernel-build-targets.patch
similarity index 97%
rename from patches/vendor/bliss/0011-Revert-kernel-Use-a-macro-for-kernel-build-targets.patch
rename to patches/vendor/bliss/0012-Revert-kernel-Use-a-macro-for-kernel-build-targets.patch
index 3bcb5da..1382615 100644
--- a/patches/vendor/bliss/0011-Revert-kernel-Use-a-macro-for-kernel-build-targets.patch
+++ b/patches/vendor/bliss/0012-Revert-kernel-Use-a-macro-for-kernel-build-targets.patch
@@ -1,7 +1,7 @@
-From 9afa3ceca47aa1db7f1f2a661d6c75fac6631a27 Mon Sep 17 00:00:00 2001
+From 5a0d02bec98a0dc637a09f7b507196ec98aac305 Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
-Date: Fri, 3 May 2019 14:49:33 +0200
-Subject: [PATCH 11/17] Revert "kernel: Use a macro for kernel build targets"
+Date: Mon, 6 May 2019 20:01:47 +0200
+Subject: [PATCH 12/17] Revert "kernel: Use a macro for kernel build targets"
This reverts commit 50ec7ed057150c875342d461d34fe2cc02dea12d.
---
diff --git a/patches/vendor/bliss/0012-Revert-kernel-Detect-kernel-module-usage-better.patch b/patches/vendor/bliss/0013-Revert-kernel-Detect-kernel-module-usage-better.patch
similarity index 90%
rename from patches/vendor/bliss/0012-Revert-kernel-Detect-kernel-module-usage-better.patch
rename to patches/vendor/bliss/0013-Revert-kernel-Detect-kernel-module-usage-better.patch
index d047722..ba0cfdc 100644
--- a/patches/vendor/bliss/0012-Revert-kernel-Detect-kernel-module-usage-better.patch
+++ b/patches/vendor/bliss/0013-Revert-kernel-Detect-kernel-module-usage-better.patch
@@ -1,7 +1,7 @@
-From 185f7500ccc2876cf8bf2fe0433ae7b0f70550ce Mon Sep 17 00:00:00 2001
+From 5c65767ed0316f4c8227835c258451607b39ef75 Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
-Date: Fri, 3 May 2019 14:49:43 +0200
-Subject: [PATCH 12/17] Revert "kernel: Detect kernel module usage better"
+Date: Mon, 6 May 2019 20:01:57 +0200
+Subject: [PATCH 13/17] Revert "kernel: Detect kernel module usage better"
This reverts commit fd354f2a6a73337bc89dbd77ded583617603edb0.
---
diff --git a/patches/vendor/bliss/0013-Revert-kernel-Move-kernel-module-dir-cleanup-creatio.patch b/patches/vendor/bliss/0014-Revert-kernel-Move-kernel-module-dir-cleanup-creatio.patch
similarity index 90%
rename from patches/vendor/bliss/0013-Revert-kernel-Move-kernel-module-dir-cleanup-creatio.patch
rename to patches/vendor/bliss/0014-Revert-kernel-Move-kernel-module-dir-cleanup-creatio.patch
index e534068..00e1183 100644
--- a/patches/vendor/bliss/0013-Revert-kernel-Move-kernel-module-dir-cleanup-creatio.patch
+++ b/patches/vendor/bliss/0014-Revert-kernel-Move-kernel-module-dir-cleanup-creatio.patch
@@ -1,7 +1,7 @@
-From 5a2a16ba3c0669c148a1e500d7c153debaa5f09f Mon Sep 17 00:00:00 2001
+From 4e33951109cb6188e0a5b144838aec3e267351a9 Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
-Date: Fri, 3 May 2019 14:49:52 +0200
-Subject: [PATCH 13/17] Revert "kernel: Move kernel module dir cleanup/creation
+Date: Mon, 6 May 2019 20:02:05 +0200
+Subject: [PATCH 14/17] Revert "kernel: Move kernel module dir cleanup/creation
to module install target"
This reverts commit bfc20a2ec6d7d5d3bf90e6273e2406f5f2259508.
diff --git a/patches/vendor/bliss/0014-Revert-kernel-Move-full-kernel-build-guard-flag-belo.patch b/patches/vendor/bliss/0015-Revert-kernel-Move-full-kernel-build-guard-flag-belo.patch
similarity index 86%
rename from patches/vendor/bliss/0014-Revert-kernel-Move-full-kernel-build-guard-flag-belo.patch
rename to patches/vendor/bliss/0015-Revert-kernel-Move-full-kernel-build-guard-flag-belo.patch
index 5ff8f52..49edef5 100644
--- a/patches/vendor/bliss/0014-Revert-kernel-Move-full-kernel-build-guard-flag-belo.patch
+++ b/patches/vendor/bliss/0015-Revert-kernel-Move-full-kernel-build-guard-flag-belo.patch
@@ -1,7 +1,7 @@
-From 50a889acb0bf5b93aedbb8d762e3b1eb1748f26b Mon Sep 17 00:00:00 2001
+From b2f7c8c8d7d30289272a3ab75b2c4fdc0857e5a7 Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
-Date: Fri, 3 May 2019 14:50:01 +0200
-Subject: [PATCH 14/17] Revert "kernel: Move full kernel build guard flag below
+Date: Mon, 6 May 2019 20:02:13 +0200
+Subject: [PATCH 15/17] Revert "kernel: Move full kernel build guard flag below
all targets"
This reverts commit 7eba3bc17cf826bb0592d3ce06a2d57e9480df1a.
diff --git a/patches/vendor/bliss/0016-Revert-kernel-Add-more-threads-to-kernel-build-proce.patch b/patches/vendor/bliss/0016-Revert-kernel-Add-more-threads-to-kernel-build-proce.patch
deleted file mode 100644
index d8f29cf..0000000
--- a/patches/vendor/bliss/0016-Revert-kernel-Add-more-threads-to-kernel-build-proce.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From eaae836704223219ee9bcabcd8b35658c786d666 Mon Sep 17 00:00:00 2001
-From: Jackeagle <jackeagle102@gmail.com>
-Date: Fri, 3 May 2019 14:51:33 +0200
-Subject: [PATCH 16/17] Revert "kernel: Add more threads to kernel build
- process"
-
-This reverts commit 7417156cd7b743293ee9d9f493ccc95fb8e68ef8.
----
- config/BoardConfigKernel.mk | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/config/BoardConfigKernel.mk b/config/BoardConfigKernel.mk
-index e16c47e4..74f3413b 100644
---- a/config/BoardConfigKernel.mk
-+++ b/config/BoardConfigKernel.mk
-@@ -95,9 +95,6 @@ endif
- # Clear this first to prevent accidental poisoning from env
- KERNEL_MAKE_FLAGS :=
-
--# Add back threads, ninja cuts this to $(nproc)/2
--KERNEL_MAKE_FLAGS += -j$$(nproc)
--
- ifeq ($(KERNEL_ARCH),arm)
- # Avoid "Unknown symbol _GLOBAL_OFFSET_TABLE_" errors
- KERNEL_MAKE_FLAGS += CFLAGS_MODULE="-fno-pic"
---
-2.21.0
-
diff --git a/patches/vendor/bliss/0015-Revert-kernel.mk-Support-kernels-that-use-LTO.patch b/patches/vendor/bliss/0016-Revert-kernel.mk-Support-kernels-that-use-LTO.patch
similarity index 97%
rename from patches/vendor/bliss/0015-Revert-kernel.mk-Support-kernels-that-use-LTO.patch
rename to patches/vendor/bliss/0016-Revert-kernel.mk-Support-kernels-that-use-LTO.patch
index 9d83d71..3e9f930 100644
--- a/patches/vendor/bliss/0015-Revert-kernel.mk-Support-kernels-that-use-LTO.patch
+++ b/patches/vendor/bliss/0016-Revert-kernel.mk-Support-kernels-that-use-LTO.patch
@@ -1,7 +1,7 @@
-From 332dbca7e953068df59e2cceb1545eb6bad96544 Mon Sep 17 00:00:00 2001
+From 8308720b9692814cb9bf41b835fa2ef9a708dcc2 Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
-Date: Fri, 3 May 2019 14:50:22 +0200
-Subject: [PATCH 15/17] Revert "kernel.mk: Support kernels that use LTO"
+Date: Mon, 6 May 2019 20:02:46 +0200
+Subject: [PATCH 16/17] Revert "kernel.mk: Support kernels that use LTO"
This reverts commit 811524eef488f81295c876b669d8ec7a6cad9cea.
---
diff --git a/patches/vendor/bliss/0017-Revert-vendor-bliss-Move-some-kernel-definitions-to-.patch b/patches/vendor/bliss/0017-Revert-vendor-bliss-Move-some-kernel-definitions-to-.patch
index fe56869..0943ee5 100644
--- a/patches/vendor/bliss/0017-Revert-vendor-bliss-Move-some-kernel-definitions-to-.patch
+++ b/patches/vendor/bliss/0017-Revert-vendor-bliss-Move-some-kernel-definitions-to-.patch
@@ -1,15 +1,18 @@
-From ada368514dcea02d4099ab05c787a00e8838fd84 Mon Sep 17 00:00:00 2001
+From 9dfedfcb07c21618e143ebc19ca6f7bef9b49d94 Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
-Date: Fri, 3 May 2019 14:51:44 +0200
+Date: Mon, 6 May 2019 20:05:56 +0200
Subject: [PATCH 17/17] Revert "vendor/bliss: Move some kernel definitions to
BoardConfigKernel"
This reverts commit 3a8423358f51b6616622c881e04d82ba2f603984.
+
+Change-Id: I3cb74bee1576fa3e253d41e8a49f31ef480b9fd7
+Signed-off-by: Jackeagle <jackeagle102@gmail.com>
---
build/tasks/kernel.mk | 122 ++++++++++++++++++++++++++++++++----
config/BoardConfigBliss.mk | 2 -
- config/BoardConfigKernel.mk | 111 --------------------------------
- 3 files changed, 111 insertions(+), 124 deletions(-)
+ config/BoardConfigKernel.mk | 114 ---------------------------------
+ 3 files changed, 111 insertions(+), 127 deletions(-)
delete mode 100644 config/BoardConfigKernel.mk
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
@@ -281,10 +284,10 @@
endif
diff --git a/config/BoardConfigKernel.mk b/config/BoardConfigKernel.mk
deleted file mode 100644
-index 74f3413b..00000000
+index e16c47e4..00000000
--- a/config/BoardConfigKernel.mk
+++ /dev/null
-@@ -1,111 +0,0 @@
+@@ -1,114 +0,0 @@
-# Copyright (C) 2018 The LineageOS Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
@@ -382,6 +385,9 @@
-# Clear this first to prevent accidental poisoning from env
-KERNEL_MAKE_FLAGS :=
-
+-# Add back threads, ninja cuts this to $(nproc)/2
+-KERNEL_MAKE_FLAGS += -j$$(nproc)
+-
-ifeq ($(KERNEL_ARCH),arm)
- # Avoid "Unknown symbol _GLOBAL_OFFSET_TABLE_" errors
- KERNEL_MAKE_FLAGS += CFLAGS_MODULE="-fno-pic"