vendor/bliss: Update GSI Patches
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 311fea4..9565555 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,7 +1,7 @@
-From e3a80211bcc653deb72029d534e342c116d550f3 Mon Sep 17 00:00:00 2001
+From 3f9a9d9c86cb260124124afd8938c6715236098c Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
Date: Mon, 3 Dec 2018 10:55:28 -0500
-Subject: [PATCH 01/11] Revert "verity_tool: Implement status getter"
+Subject: [PATCH 01/17] Revert "verity_tool: Implement status getter"
This reverts commit 385296fd334a854915d41ef556ce7bb981f66bb3.
---
@@ -12,7 +12,7 @@
4 files changed, 6 insertions(+), 107 deletions(-)
diff --git a/config/BoardConfigBliss.mk b/config/BoardConfigBliss.mk
-index 032e061..7ccae1d 100644
+index 032e0613..7ccae1d4 100644
--- a/config/BoardConfigBliss.mk
+++ b/config/BoardConfigBliss.mk
@@ -9,8 +9,8 @@ ifeq ($(TARGET_HW_DISK_ENCRYPTION),true)
@@ -29,7 +29,7 @@
+include vendor/bliss/config/BoardConfigQcom.mk
+endif
diff --git a/verity_tool/include/verity_tool.h b/verity_tool/include/verity_tool.h
-index b81eda1..25a6a7c 100644
+index b81eda1a..25a6a7c2 100644
--- a/verity_tool/include/verity_tool.h
+++ b/verity_tool/include/verity_tool.h
@@ -18,14 +18,6 @@
@@ -62,7 +62,7 @@
* Return codes:
*
diff --git a/verity_tool/main.cpp b/verity_tool/main.cpp
-index befdafa..f5f026a 100644
+index befdafac..f5f026aa 100644
--- a/verity_tool/main.cpp
+++ b/verity_tool/main.cpp
@@ -24,23 +24,20 @@ static void print_usage() {
@@ -119,7 +119,7 @@
printf("Error occurred in set_verity_enable\n");
exit(EXIT_FAILURE);
diff --git a/verity_tool/verity_tool.cpp b/verity_tool/verity_tool.cpp
-index 48e95b6..9575c4c 100644
+index 48e95b67..9575c4c1 100644
--- a/verity_tool/verity_tool.cpp
+++ b/verity_tool/verity_tool.cpp
@@ -108,69 +108,6 @@ static std::string get_ab_suffix() {
@@ -193,5 +193,5 @@
static bool set_avb_verity_enabled_state(AvbOps* ops, bool enable_verity) {
std::string ab_suffix = get_ab_suffix();
--
-2.17.1
+2.21.0
diff --git a/patches/vendor/bliss/0003-Revert-kernel-Remove-kernel-x-config.patch b/patches/vendor/bliss/0002-Revert-kernel-Remove-kernel-x-config.patch
similarity index 79%
rename from patches/vendor/bliss/0003-Revert-kernel-Remove-kernel-x-config.patch
rename to patches/vendor/bliss/0002-Revert-kernel-Remove-kernel-x-config.patch
index 942bf3b..185bc38 100644
--- a/patches/vendor/bliss/0003-Revert-kernel-Remove-kernel-x-config.patch
+++ b/patches/vendor/bliss/0002-Revert-kernel-Remove-kernel-x-config.patch
@@ -1,7 +1,7 @@
-From 4f058fbadbe7ae6ea770ca6f64e269c48de19edb Mon Sep 17 00:00:00 2001
+From 68745b9d232ae2ad1204401833727c00063138b4 Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
Date: Mon, 3 Dec 2018 10:55:52 -0500
-Subject: [PATCH 03/11] Revert "kernel: Remove kernel{x}config"
+Subject: [PATCH 02/17] Revert "kernel: Remove kernel{x}config"
This reverts commit 12c4070d98e0bb69869874d8fcaa22769a07d994.
---
@@ -9,12 +9,12 @@
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
-index 7a674ee..61d63bc 100644
+index aaa6b6cd..a6642534 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
-@@ -251,7 +251,18 @@ kerneltags: $(KERNEL_CONFIG)
+@@ -262,7 +262,18 @@ kerneltags: $(KERNEL_CONFIG)
$(hide) mkdir -p $(KERNEL_OUT)
- $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) tags
+ $(call make-kernel-target,tags)
-.PHONY: kernelsavedefconfig alldefconfig
+.PHONY: kernelconfig kernelxconfig kernelsavedefconfig alldefconfig
@@ -33,5 +33,5 @@
kernelsavedefconfig:
$(hide) mkdir -p $(KERNEL_OUT)
--
-2.17.1
+2.21.0
diff --git a/patches/vendor/bliss/0004-Revert-kernel-Remove-deprecated-flag-errors.patch b/patches/vendor/bliss/0003-Revert-kernel-Remove-deprecated-flag-errors.patch
similarity index 84%
rename from patches/vendor/bliss/0004-Revert-kernel-Remove-deprecated-flag-errors.patch
rename to patches/vendor/bliss/0003-Revert-kernel-Remove-deprecated-flag-errors.patch
index 315e603..5efc507 100644
--- a/patches/vendor/bliss/0004-Revert-kernel-Remove-deprecated-flag-errors.patch
+++ b/patches/vendor/bliss/0003-Revert-kernel-Remove-deprecated-flag-errors.patch
@@ -1,7 +1,7 @@
-From 7c41b7930164bfbf8b851d5ceb751c4ca22c4308 Mon Sep 17 00:00:00 2001
+From 6b43f50eb7ce1e8d2f3a5d10659049910cf9845f Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
Date: Mon, 3 Dec 2018 10:56:00 -0500
-Subject: [PATCH 04/11] Revert "kernel: Remove deprecated flag errors"
+Subject: [PATCH 03/17] Revert "kernel: Remove deprecated flag errors"
This reverts commit 31a4c13150d86dd3690fe4b79678f0578900591c.
---
@@ -9,7 +9,7 @@
1 file changed, 6 insertions(+)
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
-index 61d63bc..b42d86d 100644
+index a6642534..9c798d68 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
@@ -26,5 +26,5 @@
ifneq ($(TARGET_KERNEL_ADDITIONAL_CONFIG),)
--
-2.17.1
+2.21.0
diff --git a/patches/vendor/bliss/0005-Revert-vendor-bliss-Remove-kernel.mk-headers-generat.patch b/patches/vendor/bliss/0004-Revert-vendor-bliss-Remove-kernel.mk-headers-generat.patch
similarity index 88%
rename from patches/vendor/bliss/0005-Revert-vendor-bliss-Remove-kernel.mk-headers-generat.patch
rename to patches/vendor/bliss/0004-Revert-vendor-bliss-Remove-kernel.mk-headers-generat.patch
index 6b7e9b3..e7b2099 100644
--- a/patches/vendor/bliss/0005-Revert-vendor-bliss-Remove-kernel.mk-headers-generat.patch
+++ b/patches/vendor/bliss/0004-Revert-vendor-bliss-Remove-kernel.mk-headers-generat.patch
@@ -1,7 +1,7 @@
-From d90fac6121821ac30cd915e4a36ff107d3709b54 Mon Sep 17 00:00:00 2001
+From a8351307b800908f687ddf5af9d76db797ad74b1 Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
Date: Mon, 3 Dec 2018 10:56:07 -0500
-Subject: [PATCH 05/11] Revert "vendor/bliss: Remove kernel.mk headers
+Subject: [PATCH 04/17] Revert "vendor/bliss: Remove kernel.mk headers
generation"
This reverts commit 6a4c7c1258ffecc26324b034c9091373bf0272dd.
@@ -10,7 +10,7 @@
1 file changed, 50 insertions(+)
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
-index b42d86d..d0263d3 100644
+index 9c798d68..eeba2c0d 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -151,6 +151,9 @@ endif
@@ -21,9 +21,9 @@
+KERNEL_HEADERS_INSTALL_DEPS := $(KERNEL_OUT)/.headers_install_deps
+
ifeq ($(NEED_KERNEL_MODULE_ROOT),true)
- KERNEL_MODULES_INSTALL := root
- KERNEL_MODULES_OUT := $(TARGET_ROOT_OUT)/lib/modules
-@@ -252,6 +255,53 @@ $(TARGET_KERNEL_MODULES): TARGET_KERNEL_BINARIES
+ KERNEL_MODULES_OUT := $(TARGET_ROOT_OUT)
+ KERNEL_DEPMOD_STAGING_DIR := $(call intermediates-dir-for,PACKAGING,depmod_recovery)
+@@ -263,6 +266,53 @@ $(TARGET_KERNEL_MODULES): TARGET_KERNEL_BINARIES
$(TARGET_PREBUILT_INT_KERNEL): $(TARGET_KERNEL_MODULES)
@@ -78,5 +78,5 @@
kerneltags: $(KERNEL_CONFIG)
$(hide) mkdir -p $(KERNEL_OUT)
--
-2.17.1
+2.21.0
diff --git a/patches/vendor/bliss/0006-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
similarity index 83%
rename from patches/vendor/bliss/0006-Revert-vendor-bliss-Add-techpack-audio-to-include-pa.patch
rename to patches/vendor/bliss/0005-Revert-vendor-bliss-Add-techpack-audio-to-include-pa.patch
index 194636f..b7b6080 100644
--- a/patches/vendor/bliss/0006-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,7 +1,7 @@
-From 13226c228097836551fadec8d39fd7e0e63f83eb Mon Sep 17 00:00:00 2001
+From f3436b1722f4271e951cb9321193a84d7d1854d6 Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
Date: Mon, 3 Dec 2018 10:56:58 -0500
-Subject: [PATCH 06/11] Revert "vendor/bliss: Add techpack/audio to include
+Subject: [PATCH 05/17] Revert "vendor/bliss: Add techpack/audio to include
path also"
This reverts commit 3f22fe9e171b1dd2697d3a5c76fab2d614837064.
@@ -10,7 +10,7 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/soong/Android.bp b/build/soong/Android.bp
-index 057dea8..3addbe3 100644
+index 057dea8c..3addbe36 100644
--- a/build/soong/Android.bp
+++ b/build/soong/Android.bp
@@ -30,7 +30,7 @@ bliss_generator {
@@ -23,5 +23,5 @@
// Sources for dependency tracking
dep_root: "$(TARGET_KERNEL_SOURCE)",
--
-2.17.1
+2.21.0
diff --git a/patches/vendor/bliss/0007-Revert-vendor-bliss-Dynamically-generate-kernel-head.patch b/patches/vendor/bliss/0006-Revert-vendor-bliss-Dynamically-generate-kernel-head.patch
similarity index 94%
rename from patches/vendor/bliss/0007-Revert-vendor-bliss-Dynamically-generate-kernel-head.patch
rename to patches/vendor/bliss/0006-Revert-vendor-bliss-Dynamically-generate-kernel-head.patch
index 987b0d8..add6b1e 100644
--- a/patches/vendor/bliss/0007-Revert-vendor-bliss-Dynamically-generate-kernel-head.patch
+++ b/patches/vendor/bliss/0006-Revert-vendor-bliss-Dynamically-generate-kernel-head.patch
@@ -1,7 +1,7 @@
-From d014ce1fe3553eeaeab69346b5a5b7fb4833ae4b Mon Sep 17 00:00:00 2001
+From dc1368db839b143fa6475bbfd03d9653fdb18ee5 Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
Date: Mon, 3 Dec 2018 10:57:02 -0500
-Subject: [PATCH 07/11] Revert "vendor/bliss: Dynamically generate kernel
+Subject: [PATCH 06/17] Revert "vendor/bliss: Dynamically generate kernel
headers using bliss generator"
This reverts commit e0831af9a803dc2bdd1d203d93c3e3ce9b8e120a.
@@ -16,7 +16,7 @@
delete mode 100644 config/BoardConfigSoong.mk
diff --git a/build/soong/Android.bp b/build/soong/Android.bp
-index 3addbe3..45a4ab7 100644
+index 3addbe36..45a4ab72 100644
--- a/build/soong/Android.bp
+++ b/build/soong/Android.bp
@@ -18,28 +18,6 @@ bootstrap_go_package {
@@ -49,7 +49,7 @@
- vendor_available: true,
-}
diff --git a/build/soong/generator/generator.go b/build/soong/generator/generator.go
-index ffaece3..b14a19c 100644
+index ffaece32..b14a19c5 100644
--- a/build/soong/generator/generator.go
+++ b/build/soong/generator/generator.go
@@ -213,13 +213,10 @@ func (g *Module) GenerateAndroidBuildActions(ctx android.ModuleContext) {
@@ -77,7 +77,7 @@
switch name {
diff --git a/build/soong/generator/variables.go b/build/soong/generator/variables.go
deleted file mode 100644
-index 3e633ff..0000000
+index 3e633ffb..00000000
--- a/build/soong/generator/variables.go
+++ /dev/null
@@ -1,28 +0,0 @@
@@ -110,7 +110,7 @@
- return out
-}
diff --git a/config/BoardConfigBliss.mk b/config/BoardConfigBliss.mk
-index 7ccae1d..e38938b 100644
+index 7ccae1d4..e38938b0 100644
--- a/config/BoardConfigBliss.mk
+++ b/config/BoardConfigBliss.mk
@@ -9,7 +9,6 @@ ifeq ($(TARGET_HW_DISK_ENCRYPTION),true)
@@ -123,7 +123,7 @@
include vendor/bliss/config/BoardConfigQcom.mk
diff --git a/config/BoardConfigSoong.mk b/config/BoardConfigSoong.mk
deleted file mode 100644
-index 35d7893..0000000
+index 35d7893c..00000000
--- a/config/BoardConfigSoong.mk
+++ /dev/null
@@ -1,18 +0,0 @@
@@ -146,5 +146,5 @@
-
-$(foreach v,$(EXPORT_TO_SOONG),$(eval $(call addVar,$(v))))
--
-2.17.1
+2.21.0
diff --git a/patches/vendor/bliss/0008-Revert-vendor-bliss-Add-soong-generator-module-type.patch b/patches/vendor/bliss/0007-Revert-vendor-bliss-Add-soong-generator-module-type.patch
similarity index 98%
rename from patches/vendor/bliss/0008-Revert-vendor-bliss-Add-soong-generator-module-type.patch
rename to patches/vendor/bliss/0007-Revert-vendor-bliss-Add-soong-generator-module-type.patch
index a0e65f1..3785542 100644
--- a/patches/vendor/bliss/0008-Revert-vendor-bliss-Add-soong-generator-module-type.patch
+++ b/patches/vendor/bliss/0007-Revert-vendor-bliss-Add-soong-generator-module-type.patch
@@ -1,7 +1,7 @@
-From 839d87c6504651a31c4933bc5582b2814d40a259 Mon Sep 17 00:00:00 2001
+From 31ddd59654c1e4cbef68e60ca8cf59f05a374a44 Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
Date: Mon, 3 Dec 2018 10:57:16 -0500
-Subject: [PATCH 08/11] Revert "vendor/bliss: Add soong generator module type"
+Subject: [PATCH 07/17] Revert "vendor/bliss: Add soong generator module type"
This reverts commit 0d2bcd429f2227c1efd59c2a7a4916f6f10c8af2.
---
@@ -11,7 +11,7 @@
delete mode 100644 build/soong/generator/generator.go
diff --git a/build/soong/Android.bp b/build/soong/Android.bp
-index 45a4ab7..2cb1afa 100644
+index 45a4ab72..2cb1afa0 100644
--- a/build/soong/Android.bp
+++ b/build/soong/Android.bp
@@ -5,19 +5,3 @@ bootstrap_go_package {
@@ -36,7 +36,7 @@
-}
diff --git a/build/soong/generator/generator.go b/build/soong/generator/generator.go
deleted file mode 100644
-index b14a19c..0000000
+index b14a19c5..00000000
--- a/build/soong/generator/generator.go
+++ /dev/null
@@ -1,307 +0,0 @@
@@ -348,5 +348,5 @@
- return m
-}
--
-2.17.1
+2.21.0
diff --git a/patches/vendor/bliss/0010-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
similarity index 90%
rename from patches/vendor/bliss/0010-Revert-soong_config-Add-flag-for-crypto-waiting-on-Q.patch
rename to patches/vendor/bliss/0008-Revert-soong_config-Add-flag-for-crypto-waiting-on-Q.patch
index 4326d0e..f19d810 100644
--- a/patches/vendor/bliss/0010-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,7 +1,7 @@
-From 02703201a3d2b228620fbbfcca4a44c53f821ffe Mon Sep 17 00:00:00 2001
+From 9cd22c7495ff6865ec764ac83ce49c7bfda86fc4 Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
Date: Wed, 19 Dec 2018 17:06:59 +0100
-Subject: [PATCH 10/11] Revert "soong_config: Add flag for crypto waiting on
+Subject: [PATCH 08/17] Revert "soong_config: Add flag for crypto waiting on
QSEE to start"
This reverts commit 9ce6d1fa37b1bf4ac78f9fcd10302820f8161565.
@@ -11,7 +11,7 @@
2 files changed, 5 deletions(-)
diff --git a/build/soong/android/variable.go b/build/soong/android/variable.go
-index 67452c7..0123521 100644
+index 67452c73..01235217 100644
--- a/build/soong/android/variable.go
+++ b/build/soong/android/variable.go
@@ -36,9 +36,6 @@ type Product_variables struct {
@@ -31,7 +31,7 @@
- Device_support_wait_for_qsee *bool `json:",omitempty"`
}
diff --git a/build/soong/soong_config.mk b/build/soong/soong_config.mk
-index 91e0b41..c31cb22 100644
+index 91e0b417..c31cb22d 100644
--- a/build/soong/soong_config.mk
+++ b/build/soong/soong_config.mk
@@ -7,7 +7,6 @@ $(call add_json_str_omitempty, Additional_gralloc_10_usage_bits, $(TARGET_ADDITI
@@ -43,5 +43,5 @@
$(call add_json_str, Specific_camera_parameter_library, $(TARGET_SPECIFIC_CAMERA_PARAMETER_LIBRARY))
$(call add_json_str_omitempty, Target_shim_libs, $(TARGET_LD_SHIM_LIBS))
--
-2.17.1
+2.21.0
diff --git a/patches/vendor/bliss/0011-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
similarity index 92%
rename from patches/vendor/bliss/0011-Revert-soong_config-Add-flag-for-legacy-HW-FDE.patch
rename to patches/vendor/bliss/0009-Revert-soong_config-Add-flag-for-legacy-HW-FDE.patch
index 75168a6..b775e70 100644
--- a/patches/vendor/bliss/0011-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,7 +1,7 @@
-From e9a1c2d62bc123e66ac785f48b86334e33190fdf Mon Sep 17 00:00:00 2001
+From d45a6046c187c16f912d6250d0bd7dae0e06e83e Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
Date: Wed, 19 Dec 2018 17:07:12 +0100
-Subject: [PATCH 11/11] Revert "soong_config: Add flag for legacy HW FDE"
+Subject: [PATCH 09/17] Revert "soong_config: Add flag for legacy HW FDE"
This reverts commit b9c76da9c82d09514aeaaf74a13ed6c5bc32dfcb.
---
@@ -10,7 +10,7 @@
2 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/build/soong/android/variable.go b/build/soong/android/variable.go
-index 0123521..c11ec95 100644
+index 01235217..c11ec958 100644
--- a/build/soong/android/variable.go
+++ b/build/soong/android/variable.go
@@ -25,17 +25,6 @@ type Product_variables struct {
@@ -42,7 +42,7 @@
+ Target_process_sdk_version_override *string `json:",omitempty"`
}
diff --git a/build/soong/soong_config.mk b/build/soong/soong_config.mk
-index c31cb22..d4ea787 100644
+index c31cb22d..d4ea7877 100644
--- a/build/soong/soong_config.mk
+++ b/build/soong/soong_config.mk
@@ -4,9 +4,6 @@ _contents := $(_contents) "Bliss":{$(newline)
@@ -56,5 +56,5 @@
$(call add_json_str, Specific_camera_parameter_library, $(TARGET_SPECIFIC_CAMERA_PARAMETER_LIBRARY))
$(call add_json_str_omitempty, Target_shim_libs, $(TARGET_LD_SHIM_LIBS))
--
-2.17.1
+2.21.0
diff --git a/patches/vendor/bliss/0010-Revert-kernel-Use-build-image-kernel-modules-instead.patch b/patches/vendor/bliss/0010-Revert-kernel-Use-build-image-kernel-modules-instead.patch
new file mode 100644
index 0000000..489c20e
--- /dev/null
+++ b/patches/vendor/bliss/0010-Revert-kernel-Use-build-image-kernel-modules-instead.patch
@@ -0,0 +1,73 @@
+From 51c9997f5ec7f6735480441b045a129dc327416f 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
+ of copying it"
+
+This reverts commit dbda78c5e62807ec700be086216d5e2cbb28330f.
+---
+ build/tasks/kernel.mk | 29 ++++++++++++++++++++---------
+ 1 file changed, 20 insertions(+), 9 deletions(-)
+
+diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
+index eeba2c0d..d1862031 100644
+--- a/build/tasks/kernel.mk
++++ b/build/tasks/kernel.mk
+@@ -155,19 +155,21 @@ KERNEL_HEADERS_INSTALL_DIR := $(KERNEL_OUT)/usr
+ KERNEL_HEADERS_INSTALL_DEPS := $(KERNEL_OUT)/.headers_install_deps
+
+ ifeq ($(NEED_KERNEL_MODULE_ROOT),true)
+-KERNEL_MODULES_OUT := $(TARGET_ROOT_OUT)
++KERNEL_MODULES_INSTALL := root
++KERNEL_MODULES_OUT := $(TARGET_ROOT_OUT)/lib/modules
+ KERNEL_DEPMOD_STAGING_DIR := $(call intermediates-dir-for,PACKAGING,depmod_recovery)
+ KERNEL_MODULE_MOUNTPOINT :=
+ else ifeq ($(NEED_KERNEL_MODULE_SYSTEM),true)
+-KERNEL_MODULES_OUT := $(TARGET_OUT)
++KERNEL_MODULES_INSTALL := $(TARGET_COPY_OUT_SYSTEM)
++KERNEL_MODULES_OUT := $(TARGET_OUT)/lib/modules
+ KERNEL_DEPMOD_STAGING_DIR := $(call intermediates-dir-for,PACKAGING,depmod_system)
+ KERNEL_MODULE_MOUNTPOINT := system
+ else
+-KERNEL_MODULES_OUT := $(TARGET_OUT_VENDOR)
++KERNEL_MODULES_INSTALL := $(TARGET_COPY_OUT_VENDOR)
++KERNEL_MODULES_OUT := $(TARGET_OUT_VENDOR)/lib/modules
+ KERNEL_DEPMOD_STAGING_DIR := $(call intermediates-dir-for,PACKAGING,depmod_vendor)
+ KERNEL_MODULE_MOUNTPOINT := vendor
+ endif
+-MODULES_INTERMEDIATES := $(call intermediates-dir-for,PACKAGING,kernel_modules)
+
+ ifeq ($(TARGET_KERNEL_CLANG_COMPILE),true)
+ ifneq ($(TARGET_KERNEL_CLANG_VERSION),)
+@@ -252,14 +254,23 @@ TARGET_KERNEL_BINARIES: $(KERNEL_CONFIG)
+
+ .PHONY: INSTALLED_KERNEL_MODULES
+ INSTALLED_KERNEL_MODULES: depmod-host
++ $(hide) rm -rf $(KERNEL_MODULES_OUT)
++ $(hide) mkdir -p $(KERNEL_MODULES_OUT)
++ $(hide) rm -rf $(KERNEL_DEPMOD_STAGING_DIR)
+ $(hide) if grep -q '=m' $(KERNEL_CONFIG); then \
+ echo "Installing Kernel Modules"; \
+- $(call make-kernel-target,INSTALL_MOD_PATH=$(MODULES_INTERMEDIATES) modules_install); \
+- modules=$$(find $(MODULES_INTERMEDIATES) -type f -name '*.ko'); \
+- for f in $$modules; do \
++ $(call make-kernel-target,INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) modules_install) && \
++ mofile=$$(find $(KERNEL_MODULES_OUT) -type f -name modules.order) && \
++ mpath=$$(dirname $$mofile) && \
++ for f in $$(find $$mpath/kernel -type f -name '*.ko'); 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))); \
++ mv $$f $(KERNEL_MODULES_OUT); \
++ done && \
++ rm -rf $$mpath && \
++ mkdir -p $(KERNEL_DEPMOD_STAGING_DIR)/lib/modules/0.0/$(KERNEL_MODULE_MOUNTPOINT)/lib/modules && \
++ find $(KERNEL_MODULES_OUT) -name *.ko -exec cp {} $(KERNEL_DEPMOD_STAGING_DIR)/lib/modules/0.0/$(KERNEL_MODULE_MOUNTPOINT)/lib/modules \; && \
++ $(DEPMOD) -b $(KERNEL_DEPMOD_STAGING_DIR) 0.0 && \
++ sed -e 's/\(.*modules.*\):/\/\1:/g' -e 's/ \([^ ]*modules[^ ]*\)/ \/\1/g' $(KERNEL_DEPMOD_STAGING_DIR)/lib/modules/0.0/modules.dep > $(KERNEL_MODULES_OUT)/modules.dep; \
+ fi
+
+ $(TARGET_KERNEL_MODULES): TARGET_KERNEL_BINARIES
+--
+2.21.0
+
diff --git a/patches/vendor/bliss/0011-Revert-kernel-Use-a-macro-for-kernel-build-targets.patch b/patches/vendor/bliss/0011-Revert-kernel-Use-a-macro-for-kernel-build-targets.patch
new file mode 100644
index 0000000..3bcb5da
--- /dev/null
+++ b/patches/vendor/bliss/0011-Revert-kernel-Use-a-macro-for-kernel-build-targets.patch
@@ -0,0 +1,127 @@
+From 9afa3ceca47aa1db7f1f2a661d6c75fac6631a27 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"
+
+This reverts commit 50ec7ed057150c875342d461d34fe2cc02dea12d.
+---
+ build/tasks/kernel.mk | 49 +++++++++++++------------------------------
+ 1 file changed, 14 insertions(+), 35 deletions(-)
+
+diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
+index d1862031..5df1ec54 100644
+--- a/build/tasks/kernel.mk
++++ b/build/tasks/kernel.mk
+@@ -199,25 +199,6 @@ endif
+
+ KERNEL_ADDITIONAL_CONFIG_OUT := $(KERNEL_OUT)/.additional_config
+
+-# Internal implementation of make-kernel-target
+-# $(1): output path (The value passed to O=)
+-# $(2): target to build (eg. defconfig, modules, dtbo.img)
+-define internal-make-kernel-target
+-$(PATH_OVERRIDE) $(MAKE) -C $(KERNEL_SRC) O=$(1) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) $(2)
+-endef
+-
+-# Make a kernel target
+-# $(1): The kernel target to build (eg. defconfig, modules, modules_install)
+-define make-kernel-target
+-$(call internal-make-kernel-target,$(KERNEL_OUT),$(1))
+-endef
+-
+-# Make a DTBO target
+-# $(1): The DTBO target to build (eg. dtbo.img, defconfig)
+-define make-dtbo-target
+-$(call internal-make-kernel-target,$(PRODUCT_OUT)/dtbo,$(1))
+-endef
+-
+ .PHONY: force_additional_config
+ $(KERNEL_ADDITIONAL_CONFIG_OUT): force_additional_config
+ $(hide) cmp -s $(KERNEL_ADDITIONAL_CONFIG_SRC) $@ || cp $(KERNEL_ADDITIONAL_CONFIG_SRC) $@;
+@@ -225,31 +206,29 @@ $(KERNEL_ADDITIONAL_CONFIG_OUT): force_additional_config
+ $(KERNEL_CONFIG): $(KERNEL_DEFCONFIG_SRC) $(KERNEL_ADDITIONAL_CONFIG_OUT)
+ @echo "Building Kernel Config"
+ $(hide) mkdir -p $(KERNEL_OUT)
+- $(call make-kernel-target,VARIANT_DEFCONFIG=$(VARIANT_DEFCONFIG) SELINUX_DEFCONFIG=$(SELINUX_DEFCONFIG) $(KERNEL_DEFCONFIG))
++ $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) VARIANT_DEFCONFIG=$(VARIANT_DEFCONFIG) SELINUX_DEFCONFIG=$(SELINUX_DEFCONFIG) $(KERNEL_DEFCONFIG)
+ $(hide) if [ ! -z "$(KERNEL_CONFIG_OVERRIDE)" ]; then \
+ echo "Overriding kernel config with '$(KERNEL_CONFIG_OVERRIDE)'"; \
+ echo $(KERNEL_CONFIG_OVERRIDE) >> $(KERNEL_OUT)/.config; \
+- $(call make-kernel-target,oldconfig); \
+- fi
++ $(PATH_OVERRIDE) $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) oldconfig; fi
+ # Create defconfig build artifact
+- $(call make-kernel-target,savedefconfig)
++ $(hide) $(PATH_OVERRIDE) $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) savedefconfig
+ $(hide) if [ ! -z "$(KERNEL_ADDITIONAL_CONFIG)" ]; then \
+ echo "Using additional config '$(KERNEL_ADDITIONAL_CONFIG)'"; \
+ $(KERNEL_SRC)/scripts/kconfig/merge_config.sh -m -O $(KERNEL_OUT) $(KERNEL_OUT)/.config $(KERNEL_SRC)/arch/$(KERNEL_ARCH)/configs/$(KERNEL_ADDITIONAL_CONFIG); \
+- $(call make-kernel-target,KCONFIG_ALLCONFIG=$(KERNEL_OUT)/.config alldefconfig); \
+- fi
++ $(PATH_OVERRIDE) $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) KCONFIG_ALLCONFIG=$(KERNEL_OUT)/.config alldefconfig; fi
+
+ .PHONY: TARGET_KERNEL_BINARIES
+ TARGET_KERNEL_BINARIES: $(KERNEL_CONFIG)
+ @echo "Building Kernel"
+- $(call make-kernel-target,$(BOARD_KERNEL_IMAGE_NAME))
++ $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) $(BOARD_KERNEL_IMAGE_NAME)
+ $(hide) if grep -q '^CONFIG_OF=y' $(KERNEL_CONFIG); then \
+ echo "Building DTBs"; \
+- $(call make-kernel-target,dtbs); \
++ $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) dtbs; \
+ fi
+ $(hide) if grep -q '=m' $(KERNEL_CONFIG); then \
+ echo "Building Kernel Modules"; \
+- $(call make-kernel-target,modules); \
++ $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) modules; \
+ fi
+
+ .PHONY: INSTALLED_KERNEL_MODULES
+@@ -259,7 +238,7 @@ INSTALLED_KERNEL_MODULES: depmod-host
+ $(hide) rm -rf $(KERNEL_DEPMOD_STAGING_DIR)
+ $(hide) if grep -q '=m' $(KERNEL_CONFIG); then \
+ echo "Installing Kernel Modules"; \
+- $(call make-kernel-target,INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) modules_install) && \
++ $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) modules_install && \
+ mofile=$$(find $(KERNEL_MODULES_OUT) -type f -name modules.order) && \
+ mpath=$$(dirname $$mofile) && \
+ for f in $$(find $$mpath/kernel -type f -name '*.ko'); do \
+@@ -327,7 +306,7 @@ $(KERNEL_HEADERS_INSTALL_DIR): $(KERNEL_HEADERS_INSTALL_DEPS)
+ .PHONY: kerneltags
+ kerneltags: $(KERNEL_CONFIG)
+ $(hide) mkdir -p $(KERNEL_OUT)
+- $(call make-kernel-target,tags)
++ $(PATH_OVERRIDE) $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) tags
+
+ .PHONY: kernelconfig kernelxconfig kernelsavedefconfig alldefconfig
+
+@@ -344,21 +323,21 @@ kernelxconfig kernelconfig:
+
+ kernelsavedefconfig:
+ $(hide) mkdir -p $(KERNEL_OUT)
+- $(call make-kernel-target,$(KERNEL_DEFCONFIG))
++ $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) $(KERNEL_DEFCONFIG)
+ env KCONFIG_NOTIMESTAMP=true \
+- $(call make-kernel-target,savedefconfig)
++ $(PATH_OVERRIDE) $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) savedefconfig
+ cp $(KERNEL_OUT)/defconfig $(KERNEL_DEFCONFIG_SRC)
+
+ alldefconfig:
+ $(hide) mkdir -p $(KERNEL_OUT)
+ env KCONFIG_NOTIMESTAMP=true \
+- $(call make-kernel-target,alldefconfig)
++ $(PATH_OVERRIDE) $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) alldefconfig
+
+ TARGET_PREBUILT_DTBO = $(PRODUCT_OUT)/dtbo/arch/$(KERNEL_ARCH)/boot/dtbo.img
+ $(TARGET_PREBUILT_DTBO): $(AVBTOOL)
+ echo -e ${CL_GRN}"Building DTBO.img"${CL_RST}
+- $(call make-dtbo-target,$(KERNEL_DEFCONFIG))
+- $(call make-dtbo-target,dtbo.img)
++ $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(PRODUCT_OUT)/dtbo ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) $(KERNEL_DEFCONFIG)
++ $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(PRODUCT_OUT)/dtbo ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) dtbo.img
+ $(AVBTOOL) add_hash_footer \
+ --image $@ \
+ --partition_size $(BOARD_DTBOIMG_PARTITION_SIZE) \
+--
+2.21.0
+
diff --git a/patches/vendor/bliss/0012-Revert-kernel-Detect-kernel-module-usage-better.patch b/patches/vendor/bliss/0012-Revert-kernel-Detect-kernel-module-usage-better.patch
new file mode 100644
index 0000000..d047722
--- /dev/null
+++ b/patches/vendor/bliss/0012-Revert-kernel-Detect-kernel-module-usage-better.patch
@@ -0,0 +1,35 @@
+From 185f7500ccc2876cf8bf2fe0433ae7b0f70550ce 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"
+
+This reverts commit fd354f2a6a73337bc89dbd77ded583617603edb0.
+---
+ build/tasks/kernel.mk | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
+index 5df1ec54..6d8e2aa4 100644
+--- a/build/tasks/kernel.mk
++++ b/build/tasks/kernel.mk
+@@ -226,7 +226,7 @@ TARGET_KERNEL_BINARIES: $(KERNEL_CONFIG)
+ echo "Building DTBs"; \
+ $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) dtbs; \
+ fi
+- $(hide) if grep -q '=m' $(KERNEL_CONFIG); then \
++ $(hide) if grep -q '^CONFIG_MODULES=y' $(KERNEL_CONFIG); then \
+ echo "Building Kernel Modules"; \
+ $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) modules; \
+ fi
+@@ -236,7 +236,7 @@ INSTALLED_KERNEL_MODULES: depmod-host
+ $(hide) rm -rf $(KERNEL_MODULES_OUT)
+ $(hide) mkdir -p $(KERNEL_MODULES_OUT)
+ $(hide) rm -rf $(KERNEL_DEPMOD_STAGING_DIR)
+- $(hide) if grep -q '=m' $(KERNEL_CONFIG); then \
++ $(hide) if grep -q '^CONFIG_MODULES=y' $(KERNEL_CONFIG); then \
+ echo "Installing Kernel Modules"; \
+ $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) modules_install && \
+ mofile=$$(find $(KERNEL_MODULES_OUT) -type f -name modules.order) && \
+--
+2.21.0
+
diff --git a/patches/vendor/bliss/0013-Revert-kernel-Move-kernel-module-dir-cleanup-creatio.patch b/patches/vendor/bliss/0013-Revert-kernel-Move-kernel-module-dir-cleanup-creatio.patch
new file mode 100644
index 0000000..e534068
--- /dev/null
+++ b/patches/vendor/bliss/0013-Revert-kernel-Move-kernel-module-dir-cleanup-creatio.patch
@@ -0,0 +1,38 @@
+From 5a2a16ba3c0669c148a1e500d7c153debaa5f09f 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
+ to module install target"
+
+This reverts commit bfc20a2ec6d7d5d3bf90e6273e2406f5f2259508.
+---
+ build/tasks/kernel.mk | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
+index 6d8e2aa4..869bc7b9 100644
+--- a/build/tasks/kernel.mk
++++ b/build/tasks/kernel.mk
+@@ -221,6 +221,9 @@ $(KERNEL_CONFIG): $(KERNEL_DEFCONFIG_SRC) $(KERNEL_ADDITIONAL_CONFIG_OUT)
+ .PHONY: TARGET_KERNEL_BINARIES
+ TARGET_KERNEL_BINARIES: $(KERNEL_CONFIG)
+ @echo "Building Kernel"
++ $(hide) rm -rf $(KERNEL_MODULES_OUT)
++ $(hide) mkdir -p $(KERNEL_MODULES_OUT)
++ $(hide) rm -rf $(KERNEL_DEPMOD_STAGING_DIR)
+ $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) $(BOARD_KERNEL_IMAGE_NAME)
+ $(hide) if grep -q '^CONFIG_OF=y' $(KERNEL_CONFIG); then \
+ echo "Building DTBs"; \
+@@ -233,9 +236,6 @@ TARGET_KERNEL_BINARIES: $(KERNEL_CONFIG)
+
+ .PHONY: INSTALLED_KERNEL_MODULES
+ INSTALLED_KERNEL_MODULES: depmod-host
+- $(hide) rm -rf $(KERNEL_MODULES_OUT)
+- $(hide) mkdir -p $(KERNEL_MODULES_OUT)
+- $(hide) rm -rf $(KERNEL_DEPMOD_STAGING_DIR)
+ $(hide) if grep -q '^CONFIG_MODULES=y' $(KERNEL_CONFIG); then \
+ echo "Installing Kernel Modules"; \
+ $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) modules_install && \
+--
+2.21.0
+
diff --git a/patches/vendor/bliss/0014-Revert-kernel-Move-full-kernel-build-guard-flag-belo.patch b/patches/vendor/bliss/0014-Revert-kernel-Move-full-kernel-build-guard-flag-belo.patch
new file mode 100644
index 0000000..5ff8f52
--- /dev/null
+++ b/patches/vendor/bliss/0014-Revert-kernel-Move-full-kernel-build-guard-flag-belo.patch
@@ -0,0 +1,36 @@
+From 50a889acb0bf5b93aedbb8d762e3b1eb1748f26b 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
+ all targets"
+
+This reverts commit 7eba3bc17cf826bb0592d3ce06a2d57e9480df1a.
+---
+ build/tasks/kernel.mk | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
+index 869bc7b9..a0a095a7 100644
+--- a/build/tasks/kernel.mk
++++ b/build/tasks/kernel.mk
+@@ -333,6 +333,8 @@ alldefconfig:
+ env KCONFIG_NOTIMESTAMP=true \
+ $(PATH_OVERRIDE) $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) alldefconfig
+
++endif # FULL_KERNEL_BUILD
++
+ TARGET_PREBUILT_DTBO = $(PRODUCT_OUT)/dtbo/arch/$(KERNEL_ARCH)/boot/dtbo.img
+ $(TARGET_PREBUILT_DTBO): $(AVBTOOL)
+ echo -e ${CL_GRN}"Building DTBO.img"${CL_RST}
+@@ -344,8 +346,6 @@ $(TARGET_PREBUILT_DTBO): $(AVBTOOL)
+ --partition_name dtbo $(INTERNAL_AVB_DTBO_SIGNING_ARGS) \
+ $(BOARD_AVB_DTBO_ADD_HASH_FOOTER_ARGS)
+
+-endif # FULL_KERNEL_BUILD
+-
+ ## Install it
+
+ ifeq ($(NEEDS_KERNEL_COPY),true)
+--
+2.21.0
+
diff --git a/patches/vendor/bliss/0002-Revert-kernel.mk-Support-kernels-that-use-LTO.patch b/patches/vendor/bliss/0015-Revert-kernel.mk-Support-kernels-that-use-LTO.patch
similarity index 92%
rename from patches/vendor/bliss/0002-Revert-kernel.mk-Support-kernels-that-use-LTO.patch
rename to patches/vendor/bliss/0015-Revert-kernel.mk-Support-kernels-that-use-LTO.patch
index 467df33..9d83d71 100644
--- a/patches/vendor/bliss/0002-Revert-kernel.mk-Support-kernels-that-use-LTO.patch
+++ b/patches/vendor/bliss/0015-Revert-kernel.mk-Support-kernels-that-use-LTO.patch
@@ -1,7 +1,7 @@
-From 2d02dfed6fb59bff818960bca3eb8c7663ec41af Mon Sep 17 00:00:00 2001
+From 332dbca7e953068df59e2cceb1545eb6bad96544 Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
-Date: Mon, 3 Dec 2018 10:55:46 -0500
-Subject: [PATCH 02/11] Revert "kernel.mk: Support kernels that use LTO"
+Date: Fri, 3 May 2019 14:50:22 +0200
+Subject: [PATCH 15/17] Revert "kernel.mk: Support kernels that use LTO"
This reverts commit 811524eef488f81295c876b669d8ec7a6cad9cea.
---
@@ -9,10 +9,10 @@
1 file changed, 15 insertions(+), 16 deletions(-)
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
-index 54812a9..7a674ee 100644
+index a0a095a7..d0263d37 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
-@@ -178,9 +178,8 @@ ifeq ($(TARGET_KERNEL_CLANG_COMPILE),true)
+@@ -187,9 +187,8 @@ ifeq ($(TARGET_KERNEL_CLANG_COMPILE),true)
else ifeq ($(KERNEL_ARCH),x86)
KERNEL_CLANG_TRIPLE ?= CLANG_TRIPLE=x86_64-linux-gnu-
endif
@@ -23,7 +23,7 @@
endif
endif
-@@ -197,17 +196,17 @@ $(KERNEL_ADDITIONAL_CONFIG_OUT): force_additional_config
+@@ -206,17 +205,17 @@ $(KERNEL_ADDITIONAL_CONFIG_OUT): force_additional_config
$(KERNEL_CONFIG): $(KERNEL_DEFCONFIG_SRC) $(KERNEL_ADDITIONAL_CONFIG_OUT)
@echo "Building Kernel Config"
$(hide) mkdir -p $(KERNEL_OUT)
@@ -45,7 +45,7 @@
.PHONY: TARGET_KERNEL_BINARIES
TARGET_KERNEL_BINARIES: $(KERNEL_CONFIG)
-@@ -215,21 +214,21 @@ TARGET_KERNEL_BINARIES: $(KERNEL_CONFIG)
+@@ -224,21 +223,21 @@ TARGET_KERNEL_BINARIES: $(KERNEL_CONFIG)
$(hide) rm -rf $(KERNEL_MODULES_OUT)
$(hide) mkdir -p $(KERNEL_MODULES_OUT)
$(hide) rm -rf $(KERNEL_DEPMOD_STAGING_DIR)
@@ -71,14 +71,16 @@
mofile=$$(find $(KERNEL_MODULES_OUT) -type f -name modules.order) && \
mpath=$$(dirname $$mofile) && \
for f in $$(find $$mpath/kernel -type f -name '*.ko'); do \
-@@ -250,29 +249,29 @@ $(TARGET_PREBUILT_INT_KERNEL): $(TARGET_KERNEL_MODULES)
+@@ -306,7 +305,7 @@ $(KERNEL_HEADERS_INSTALL_DIR): $(KERNEL_HEADERS_INSTALL_DEPS)
.PHONY: kerneltags
kerneltags: $(KERNEL_CONFIG)
$(hide) mkdir -p $(KERNEL_OUT)
- $(PATH_OVERRIDE) $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) tags
+ $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) tags
- .PHONY: kernelsavedefconfig alldefconfig
+ .PHONY: kernelconfig kernelxconfig kernelsavedefconfig alldefconfig
+
+@@ -323,23 +322,23 @@ kernelxconfig kernelconfig:
kernelsavedefconfig:
$(hide) mkdir -p $(KERNEL_OUT)
@@ -108,5 +110,5 @@
--image $@ \
--partition_size $(BOARD_DTBOIMG_PARTITION_SIZE) \
--
-2.17.1
+2.21.0
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
new file mode 100644
index 0000000..d8f29cf
--- /dev/null
+++ b/patches/vendor/bliss/0016-Revert-kernel-Add-more-threads-to-kernel-build-proce.patch
@@ -0,0 +1,28 @@
+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/0009-Revert-vendor-bliss-Move-some-kernel-definitions-to-.patch b/patches/vendor/bliss/0017-Revert-vendor-bliss-Move-some-kernel-definitions-to-.patch
similarity index 98%
rename from patches/vendor/bliss/0009-Revert-vendor-bliss-Move-some-kernel-definitions-to-.patch
rename to patches/vendor/bliss/0017-Revert-vendor-bliss-Move-some-kernel-definitions-to-.patch
index f49e7b3..fe56869 100644
--- a/patches/vendor/bliss/0009-Revert-vendor-bliss-Move-some-kernel-definitions-to-.patch
+++ b/patches/vendor/bliss/0017-Revert-vendor-bliss-Move-some-kernel-definitions-to-.patch
@@ -1,7 +1,7 @@
-From ff711e07cb11ad87fd862240815c9fade43f9594 Mon Sep 17 00:00:00 2001
+From ada368514dcea02d4099ab05c787a00e8838fd84 Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
-Date: Mon, 3 Dec 2018 10:57:23 -0500
-Subject: [PATCH 09/11] Revert "vendor/bliss: Move some kernel definitions to
+Date: Fri, 3 May 2019 14:51:44 +0200
+Subject: [PATCH 17/17] Revert "vendor/bliss: Move some kernel definitions to
BoardConfigKernel"
This reverts commit 3a8423358f51b6616622c881e04d82ba2f603984.
@@ -13,7 +13,7 @@
delete mode 100644 config/BoardConfigKernel.mk
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
-index d0263d3..6057b9f 100644
+index d0263d37..6057b9f1 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -1,5 +1,4 @@
@@ -267,7 +267,7 @@
--image $@ \
--partition_size $(BOARD_DTBOIMG_PARTITION_SIZE) \
diff --git a/config/BoardConfigBliss.mk b/config/BoardConfigBliss.mk
-index e38938b..e6102f7 100644
+index e38938b0..e6102f7a 100644
--- a/config/BoardConfigBliss.mk
+++ b/config/BoardConfigBliss.mk
@@ -8,8 +8,6 @@ ifeq ($(TARGET_HW_DISK_ENCRYPTION),true)
@@ -281,7 +281,7 @@
endif
diff --git a/config/BoardConfigKernel.mk b/config/BoardConfigKernel.mk
deleted file mode 100644
-index 74f3413..0000000
+index 74f3413b..00000000
--- a/config/BoardConfigKernel.mk
+++ /dev/null
@@ -1,111 +0,0 @@
@@ -397,5 +397,5 @@
- KERNEL_MAKE_FLAGS += LIBRARY_PATH=/usr/local/opt/openssl/lib
-endif
--
-2.17.1
+2.21.0