gsi/patches: BlissPie GSI v11.3 Stable
- Update all patches to latest changes
- Remove deprecated patches
Signed-off-by: Jackeagle <jackeagle102@gmail.com>
Change-Id: Icb36d629ee463d9a9d580ad43ef08eec7b71bdf2
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 2cda6de..d1e5211 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,11 +1,9 @@
-From 6d89034411393db371fb376931dc6c1b6b114c40 Mon Sep 17 00:00:00 2001
+From df7d12a93f9eae6b35debd5a39286962bf973fdd Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
-Date: Sat, 17 Nov 2018 08:24:08 -0700
+Date: Mon, 3 Dec 2018 10:55:28 -0500
Subject: [PATCH 1/9] Revert "verity_tool: Implement status getter"
This reverts commit 385296fd334a854915d41ef556ce7bb981f66bb3.
-
-Change-Id: I8748c6c4ee0158124ad9c4469521be7d1cc02fc6
---
config/BoardConfigBliss.mk | 8 ++--
verity_tool/include/verity_tool.h | 15 --------
@@ -14,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)
@@ -31,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 @@
@@ -64,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() {
@@ -121,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() {
diff --git a/patches/vendor/bliss/0001-skip-dependencies-check-for-Treble-builds.patch b/patches/vendor/bliss/0001-skip-dependencies-check-for-Treble-builds.patch
deleted file mode 100644
index 2ebae12..0000000
--- a/patches/vendor/bliss/0001-skip-dependencies-check-for-Treble-builds.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 82873c0c0100c6756c55a3167d604a0b83b7cc7c Mon Sep 17 00:00:00 2001
-From: Jon West <electrikjesus@gmail.com>
-Date: Thu, 25 Oct 2018 20:56:53 -0400
-Subject: [PATCH] skip dependencies check for Treble builds
-
-Change-Id: I345095b3e8c7edc1e1f373e71696f9cb309cc599
----
- build/tools/roomservice.py | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/build/tools/roomservice.py b/build/tools/roomservice.py
-index c8bcf57e..71d510c9 100755
---- a/build/tools/roomservice.py
-+++ b/build/tools/roomservice.py
-@@ -313,5 +313,4 @@ if __name__ == '__main__':
- deps_only = False
-
- if not deps_only:
-- fetch_device(device)
-- fetch_dependencies(device)
-+ print("This is a Treble build, moving along... nothing to see here")
---
-2.17.1
-
diff --git a/patches/vendor/bliss/0002-Revert-kernel.mk-Support-kernels-that-use-LTO.patch b/patches/vendor/bliss/0002-Revert-kernel.mk-Support-kernels-that-use-LTO.patch
index f92e018..9abe521 100644
--- a/patches/vendor/bliss/0002-Revert-kernel.mk-Support-kernels-that-use-LTO.patch
+++ b/patches/vendor/bliss/0002-Revert-kernel.mk-Support-kernels-that-use-LTO.patch
@@ -1,17 +1,15 @@
-From 923baf7c52a3598ab9c35ef689a9d53bfb850024 Mon Sep 17 00:00:00 2001
+From e76039ca4444117dbb5c43a8d0b6dcd9c1712db4 Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
-Date: Sat, 17 Nov 2018 08:24:36 -0700
+Date: Mon, 3 Dec 2018 10:55:46 -0500
Subject: [PATCH 2/9] Revert "kernel.mk: Support kernels that use LTO"
This reverts commit 811524eef488f81295c876b669d8ec7a6cad9cea.
-
-Change-Id: I01ddf5eedfed84c04c1a36856e495da4fb5a83c3
---
build/tasks/kernel.mk | 31 +++++++++++++++----------------
1 file changed, 15 insertions(+), 16 deletions(-)
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
-index 54812a9..7a674ee 100644
+index 54812a90..7a674ee9 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -178,9 +178,8 @@ ifeq ($(TARGET_KERNEL_CLANG_COMPILE),true)
diff --git a/patches/vendor/bliss/0003-Revert-kernel-Remove-kernel-x-config.patch b/patches/vendor/bliss/0003-Revert-kernel-Remove-kernel-x-config.patch
index f1c9601..3f639aa 100644
--- a/patches/vendor/bliss/0003-Revert-kernel-Remove-kernel-x-config.patch
+++ b/patches/vendor/bliss/0003-Revert-kernel-Remove-kernel-x-config.patch
@@ -1,6 +1,6 @@
-From 851e1066c8571b64f73abbbf4c702332fcaac623 Mon Sep 17 00:00:00 2001
+From 441c7f3ebaf200c234eebb18259dfa336ba33301 Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
-Date: Sat, 17 Nov 2018 08:26:00 -0700
+Date: Mon, 3 Dec 2018 10:55:52 -0500
Subject: [PATCH 3/9] Revert "kernel: Remove kernel{x}config"
This reverts commit 12c4070d98e0bb69869874d8fcaa22769a07d994.
@@ -9,7 +9,7 @@
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
-index 7a674ee..61d63bc 100644
+index 7a674ee9..61d63bcc 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -251,7 +251,18 @@ kerneltags: $(KERNEL_CONFIG)
diff --git a/patches/vendor/bliss/0004-Revert-kernel-Remove-deprecated-flag-errors.patch b/patches/vendor/bliss/0004-Revert-kernel-Remove-deprecated-flag-errors.patch
index a1378c9..8e67c9e 100644
--- a/patches/vendor/bliss/0004-Revert-kernel-Remove-deprecated-flag-errors.patch
+++ b/patches/vendor/bliss/0004-Revert-kernel-Remove-deprecated-flag-errors.patch
@@ -1,6 +1,6 @@
-From aeecbbc9482abc64bedd18df3ab3a74b96d5c95a Mon Sep 17 00:00:00 2001
+From 456d8976a21cbdce213b2e5a1113724c4a05d06f Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
-Date: Sat, 17 Nov 2018 08:26:06 -0700
+Date: Mon, 3 Dec 2018 10:56:00 -0500
Subject: [PATCH 4/9] 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 61d63bcc..b42d86dc 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/0005-Revert-vendor-bliss-Remove-kernel.mk-headers-generat.patch b/patches/vendor/bliss/0005-Revert-vendor-bliss-Remove-kernel.mk-headers-generat.patch
index 7bc4f19..94d4016 100644
--- a/patches/vendor/bliss/0005-Revert-vendor-bliss-Remove-kernel.mk-headers-generat.patch
+++ b/patches/vendor/bliss/0005-Revert-vendor-bliss-Remove-kernel.mk-headers-generat.patch
@@ -1,6 +1,6 @@
-From 290db10c7e0160ae1cb35e4d3d24ee40ab517362 Mon Sep 17 00:00:00 2001
+From 4a0c568b97efb930137b0f7f3a0d811df8973f5d Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
-Date: Sat, 17 Nov 2018 08:26:15 -0700
+Date: Mon, 3 Dec 2018 10:56:07 -0500
Subject: [PATCH 5/9] Revert "vendor/bliss: Remove kernel.mk headers
generation"
@@ -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 b42d86dc..d0263d37 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -151,6 +151,9 @@ endif
diff --git a/patches/vendor/bliss/0006-Revert-vendor-bliss-Add-techpack-audio-to-include-pa.patch b/patches/vendor/bliss/0006-Revert-vendor-bliss-Add-techpack-audio-to-include-pa.patch
new file mode 100644
index 0000000..9411c36
--- /dev/null
+++ b/patches/vendor/bliss/0006-Revert-vendor-bliss-Add-techpack-audio-to-include-pa.patch
@@ -0,0 +1,27 @@
+From 6615bc99f58e93e2ba390b02885b52afb16fd3c0 Mon Sep 17 00:00:00 2001
+From: Jackeagle <jackeagle102@gmail.com>
+Date: Mon, 3 Dec 2018 10:56:58 -0500
+Subject: [PATCH 6/9] Revert "vendor/bliss: Add techpack/audio to include path
+ also"
+
+This reverts commit 3f22fe9e171b1dd2697d3a5c76fab2d614837064.
+---
+ build/soong/Android.bp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build/soong/Android.bp b/build/soong/Android.bp
+index 057dea8c..3addbe36 100644
+--- a/build/soong/Android.bp
++++ b/build/soong/Android.bp
+@@ -30,7 +30,7 @@ bliss_generator {
+ cmd: "make $(KERNEL_MAKE_FLAGS) -C $(TARGET_KERNEL_SOURCE) O=$(genDir) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) headers_install",
+
+ // Directories that can be imported by a cc_* module generated_headers property
+- export_include_dirs: ["usr/include", "usr/techpack/audio/include"],
++ export_include_dirs: ["usr/include"],
+
+ // Sources for dependency tracking
+ dep_root: "$(TARGET_KERNEL_SOURCE)",
+--
+2.17.1
+
diff --git a/patches/vendor/bliss/0006-Revert-vendor-bliss-Dynamically-generate-kernel-head.patch b/patches/vendor/bliss/0007-Revert-vendor-bliss-Dynamically-generate-kernel-head.patch
similarity index 93%
rename from patches/vendor/bliss/0006-Revert-vendor-bliss-Dynamically-generate-kernel-head.patch
rename to patches/vendor/bliss/0007-Revert-vendor-bliss-Dynamically-generate-kernel-head.patch
index 8b3b2ff..4506a7e 100644
--- a/patches/vendor/bliss/0006-Revert-vendor-bliss-Dynamically-generate-kernel-head.patch
+++ b/patches/vendor/bliss/0007-Revert-vendor-bliss-Dynamically-generate-kernel-head.patch
@@ -1,7 +1,7 @@
-From bfb9d40fb9a61288099d69a48294f21ecad3d2ca Mon Sep 17 00:00:00 2001
+From fdad2906512d4c1319e55ded79f59820cb818670 Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
-Date: Sat, 17 Nov 2018 08:26:24 -0700
-Subject: [PATCH 6/9] Revert "vendor/bliss: Dynamically generate kernel headers
+Date: Mon, 3 Dec 2018 10:57:02 -0500
+Subject: [PATCH 7/9] 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 @@
diff --git a/patches/vendor/bliss/0007-Revert-vendor-bliss-Add-soong-generator-module-type.patch b/patches/vendor/bliss/0008-Revert-vendor-bliss-Add-soong-generator-module-type.patch
similarity index 97%
rename from patches/vendor/bliss/0007-Revert-vendor-bliss-Add-soong-generator-module-type.patch
rename to patches/vendor/bliss/0008-Revert-vendor-bliss-Add-soong-generator-module-type.patch
index f4b6ffa..86381d5 100644
--- a/patches/vendor/bliss/0007-Revert-vendor-bliss-Add-soong-generator-module-type.patch
+++ b/patches/vendor/bliss/0008-Revert-vendor-bliss-Add-soong-generator-module-type.patch
@@ -1,7 +1,7 @@
-From b0683d4e56b31ee4594e10e046fd4e5b2e1e8b2f Mon Sep 17 00:00:00 2001
+From dff7724ce0ebd95545d8eb5c69ea7dd4c21e1b80 Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
-Date: Sat, 17 Nov 2018 08:26:48 -0700
-Subject: [PATCH 7/9] Revert "vendor/bliss: Add soong generator module type"
+Date: Mon, 3 Dec 2018 10:57:16 -0500
+Subject: [PATCH 8/9] 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 @@
diff --git a/patches/vendor/bliss/0008-Revert-vendor-bliss-Move-some-kernel-definitions-to-.patch b/patches/vendor/bliss/0009-Revert-vendor-bliss-Move-some-kernel-definitions-to-.patch
similarity index 98%
rename from patches/vendor/bliss/0008-Revert-vendor-bliss-Move-some-kernel-definitions-to-.patch
rename to patches/vendor/bliss/0009-Revert-vendor-bliss-Move-some-kernel-definitions-to-.patch
index caf67d9..5923f20 100644
--- a/patches/vendor/bliss/0008-Revert-vendor-bliss-Move-some-kernel-definitions-to-.patch
+++ b/patches/vendor/bliss/0009-Revert-vendor-bliss-Move-some-kernel-definitions-to-.patch
@@ -1,7 +1,7 @@
-From f47a7f340355df09288b5c6aa293bc62d48da6c7 Mon Sep 17 00:00:00 2001
+From 1fe137b24228d2b6a06c3141e894a1988230811d Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
-Date: Sat, 17 Nov 2018 08:26:58 -0700
-Subject: [PATCH 8/9] Revert "vendor/bliss: Move some kernel definitions to
+Date: Mon, 3 Dec 2018 10:57:23 -0500
+Subject: [PATCH 9/9] 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 @@
diff --git a/patches/vendor/bliss/0009-skip-dependencies-check-for-Treble-builds.patch b/patches/vendor/bliss/0009-skip-dependencies-check-for-Treble-builds.patch
deleted file mode 100644
index 7873cb2..0000000
--- a/patches/vendor/bliss/0009-skip-dependencies-check-for-Treble-builds.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From f38cfa492098d083008249434a99c3f27fbfbe0d Mon Sep 17 00:00:00 2001
-From: Jon West <electrikjesus@gmail.com>
-Date: Thu, 25 Oct 2018 20:56:53 -0400
-Subject: [PATCH 9/9] skip dependencies check for Treble builds
-
-Change-Id: I345095b3e8c7edc1e1f373e71696f9cb309cc599
----
- build/tools/roomservice.py | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/build/tools/roomservice.py b/build/tools/roomservice.py
-index c8bcf57..71d510c 100755
---- a/build/tools/roomservice.py
-+++ b/build/tools/roomservice.py
-@@ -313,5 +313,4 @@ if __name__ == '__main__':
- deps_only = False
-
- if not deps_only:
-- fetch_device(device)
-- fetch_dependencies(device)
-+ print("This is a Treble build, moving along... nothing to see here")
---
-2.17.1
-