patches: Bliss GSI v11.4 Release
Signed-off-by: Jackeagle <jackeagle102@gmail.com>
Change-Id: I372e872292ed19dde130635da2882309751f59dd
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 d1e5211..311fea4 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 df7d12a93f9eae6b35debd5a39286962bf973fdd Mon Sep 17 00:00:00 2001
+From e3a80211bcc653deb72029d534e342c116d550f3 Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
Date: Mon, 3 Dec 2018 10:55:28 -0500
-Subject: [PATCH 1/9] Revert "verity_tool: Implement status getter"
+Subject: [PATCH 01/11] 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 032e0613..7ccae1d4 100644
+index 032e061..7ccae1d 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 b81eda1a..25a6a7c2 100644
+index b81eda1..25a6a7c 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 befdafac..f5f026aa 100644
+index befdafa..f5f026a 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 48e95b67..9575c4c1 100644
+index 48e95b6..9575c4c 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/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 9abe521..467df33 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,7 +1,7 @@
-From e76039ca4444117dbb5c43a8d0b6dcd9c1712db4 Mon Sep 17 00:00:00 2001
+From 2d02dfed6fb59bff818960bca3eb8c7663ec41af Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
Date: Mon, 3 Dec 2018 10:55:46 -0500
-Subject: [PATCH 2/9] Revert "kernel.mk: Support kernels that use LTO"
+Subject: [PATCH 02/11] Revert "kernel.mk: Support kernels that use LTO"
This reverts commit 811524eef488f81295c876b669d8ec7a6cad9cea.
---
@@ -9,7 +9,7 @@
1 file changed, 15 insertions(+), 16 deletions(-)
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
-index 54812a90..7a674ee9 100644
+index 54812a9..7a674ee 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 3f639aa..942bf3b 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,7 +1,7 @@
-From 441c7f3ebaf200c234eebb18259dfa336ba33301 Mon Sep 17 00:00:00 2001
+From 4f058fbadbe7ae6ea770ca6f64e269c48de19edb Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
Date: Mon, 3 Dec 2018 10:55:52 -0500
-Subject: [PATCH 3/9] Revert "kernel: Remove kernel{x}config"
+Subject: [PATCH 03/11] 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 7a674ee9..61d63bcc 100644
+index 7a674ee..61d63bc 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 8e67c9e..315e603 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,7 +1,7 @@
-From 456d8976a21cbdce213b2e5a1113724c4a05d06f Mon Sep 17 00:00:00 2001
+From 7c41b7930164bfbf8b851d5ceb751c4ca22c4308 Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
Date: Mon, 3 Dec 2018 10:56:00 -0500
-Subject: [PATCH 4/9] Revert "kernel: Remove deprecated flag errors"
+Subject: [PATCH 04/11] 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 61d63bcc..b42d86dc 100644
+index 61d63bc..b42d86d 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 94d4016..6b7e9b3 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,7 +1,7 @@
-From 4a0c568b97efb930137b0f7f3a0d811df8973f5d Mon Sep 17 00:00:00 2001
+From d90fac6121821ac30cd915e4a36ff107d3709b54 Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
Date: Mon, 3 Dec 2018 10:56:07 -0500
-Subject: [PATCH 5/9] Revert "vendor/bliss: Remove kernel.mk headers
+Subject: [PATCH 05/11] 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 b42d86dc..d0263d37 100644
+index b42d86d..d0263d3 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
index 9411c36..194636f 100644
--- 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
@@ -1,8 +1,8 @@
-From 6615bc99f58e93e2ba390b02885b52afb16fd3c0 Mon Sep 17 00:00:00 2001
+From 13226c228097836551fadec8d39fd7e0e63f83eb 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"
+Subject: [PATCH 06/11] 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 057dea8c..3addbe36 100644
+index 057dea8..3addbe3 100644
--- a/build/soong/Android.bp
+++ b/build/soong/Android.bp
@@ -30,7 +30,7 @@ bliss_generator {
diff --git a/patches/vendor/bliss/0007-Revert-vendor-bliss-Dynamically-generate-kernel-head.patch b/patches/vendor/bliss/0007-Revert-vendor-bliss-Dynamically-generate-kernel-head.patch
index 4506a7e..987b0d8 100644
--- a/patches/vendor/bliss/0007-Revert-vendor-bliss-Dynamically-generate-kernel-head.patch
+++ b/patches/vendor/bliss/0007-Revert-vendor-bliss-Dynamically-generate-kernel-head.patch
@@ -1,8 +1,8 @@
-From fdad2906512d4c1319e55ded79f59820cb818670 Mon Sep 17 00:00:00 2001
+From d014ce1fe3553eeaeab69346b5a5b7fb4833ae4b Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
Date: Mon, 3 Dec 2018 10:57:02 -0500
-Subject: [PATCH 7/9] Revert "vendor/bliss: Dynamically generate kernel headers
- using bliss generator"
+Subject: [PATCH 07/11] 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 3addbe36..45a4ab72 100644
+index 3addbe3..45a4ab7 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 ffaece32..b14a19c5 100644
+index ffaece3..b14a19c 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 3e633ffb..00000000
+index 3e633ff..0000000
--- 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 7ccae1d4..e38938b0 100644
+index 7ccae1d..e38938b 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 35d7893c..00000000
+index 35d7893..0000000
--- a/config/BoardConfigSoong.mk
+++ /dev/null
@@ -1,18 +0,0 @@
diff --git a/patches/vendor/bliss/0008-Revert-vendor-bliss-Add-soong-generator-module-type.patch b/patches/vendor/bliss/0008-Revert-vendor-bliss-Add-soong-generator-module-type.patch
index 86381d5..a0e65f1 100644
--- a/patches/vendor/bliss/0008-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 dff7724ce0ebd95545d8eb5c69ea7dd4c21e1b80 Mon Sep 17 00:00:00 2001
+From 839d87c6504651a31c4933bc5582b2814d40a259 Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
Date: Mon, 3 Dec 2018 10:57:16 -0500
-Subject: [PATCH 8/9] Revert "vendor/bliss: Add soong generator module type"
+Subject: [PATCH 08/11] 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 45a4ab72..2cb1afa0 100644
+index 45a4ab7..2cb1afa 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 b14a19c5..00000000
+index b14a19c..0000000
--- a/build/soong/generator/generator.go
+++ /dev/null
@@ -1,307 +0,0 @@
diff --git a/patches/vendor/bliss/0009-Revert-vendor-bliss-Move-some-kernel-definitions-to-.patch b/patches/vendor/bliss/0009-Revert-vendor-bliss-Move-some-kernel-definitions-to-.patch
index 5923f20..f49e7b3 100644
--- a/patches/vendor/bliss/0009-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 1fe137b24228d2b6a06c3141e894a1988230811d Mon Sep 17 00:00:00 2001
+From ff711e07cb11ad87fd862240815c9fade43f9594 Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
Date: Mon, 3 Dec 2018 10:57:23 -0500
-Subject: [PATCH 9/9] Revert "vendor/bliss: Move some kernel definitions to
+Subject: [PATCH 09/11] 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 d0263d37..6057b9f1 100644
+index d0263d3..6057b9f 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 e38938b0..e6102f7a 100644
+index e38938b..e6102f7 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 74f3413b..00000000
+index 74f3413..0000000
--- a/config/BoardConfigKernel.mk
+++ /dev/null
@@ -1,111 +0,0 @@
diff --git a/patches/vendor/bliss/0010-Revert-soong_config-Add-flag-for-crypto-waiting-on-Q.patch b/patches/vendor/bliss/0010-Revert-soong_config-Add-flag-for-crypto-waiting-on-Q.patch
new file mode 100644
index 0000000..4326d0e
--- /dev/null
+++ b/patches/vendor/bliss/0010-Revert-soong_config-Add-flag-for-crypto-waiting-on-Q.patch
@@ -0,0 +1,47 @@
+From 02703201a3d2b228620fbbfcca4a44c53f821ffe 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
+ QSEE to start"
+
+This reverts commit 9ce6d1fa37b1bf4ac78f9fcd10302820f8161565.
+---
+ build/soong/android/variable.go | 4 ----
+ build/soong/soong_config.mk | 1 -
+ 2 files changed, 5 deletions(-)
+
+diff --git a/build/soong/android/variable.go b/build/soong/android/variable.go
+index 67452c7..0123521 100644
+--- a/build/soong/android/variable.go
++++ b/build/soong/android/variable.go
+@@ -36,9 +36,6 @@ type Product_variables struct {
+ Device_support_legacy_hwfde struct {
+ Cflags []string
+ }
+- Device_support_wait_for_qsee struct {
+- Cflags []string
+- }
+ }
+
+ type ProductVariables struct {
+@@ -54,5 +51,4 @@ type ProductVariables struct {
+ Device_support_hwfde *bool `json:",omitempty"`
+ Device_support_hwfde_perf *bool `json:",omitempty"`
+ Device_support_legacy_hwfde *bool `json:",omitempty"`
+- 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
+--- 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
+ $(call add_json_bool, Device_support_hwfde, $(filter true,$(TARGET_HW_DISK_ENCRYPTION)))
+ $(call add_json_bool, Device_support_hwfde_perf, $(filter true,$(TARGET_HW_DISK_ENCRYPTION_PERF)))
+ $(call add_json_bool, Device_support_legacy_hwfde, $(filter true,$(TARGET_LEGACY_HW_DISK_ENCRYPTION)))
+-$(call add_json_bool, Device_support_wait_for_qsee, $(filter true,$(TARGET_KEYMASTER_WAIT_FOR_QSEE)))
+ $(call add_json_bool, Has_legacy_camera_hal1, $(filter true,$(TARGET_HAS_LEGACY_CAMERA_HAL1)))
+ $(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
+
diff --git a/patches/vendor/bliss/0011-Revert-soong_config-Add-flag-for-legacy-HW-FDE.patch b/patches/vendor/bliss/0011-Revert-soong_config-Add-flag-for-legacy-HW-FDE.patch
new file mode 100644
index 0000000..75168a6
--- /dev/null
+++ b/patches/vendor/bliss/0011-Revert-soong_config-Add-flag-for-legacy-HW-FDE.patch
@@ -0,0 +1,60 @@
+From e9a1c2d62bc123e66ac785f48b86334e33190fdf 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"
+
+This reverts commit b9c76da9c82d09514aeaaf74a13ed6c5bc32dfcb.
+---
+ build/soong/android/variable.go | 16 +---------------
+ build/soong/soong_config.mk | 3 ---
+ 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
+--- a/build/soong/android/variable.go
++++ b/build/soong/android/variable.go
+@@ -25,17 +25,6 @@ type Product_variables struct {
+ Target_process_sdk_version_override struct {
+ Cppflags []string
+ }
+- Device_support_hwfde struct {
+- Cflags []string
+- Header_libs []string
+- Shared_libs []string
+- }
+- Device_support_hwfde_perf struct {
+- Cflags []string
+- }
+- Device_support_legacy_hwfde struct {
+- Cflags []string
+- }
+ }
+
+ type ProductVariables struct {
+@@ -47,8 +36,5 @@ type ProductVariables struct {
+ Uses_nvidia_enhancements *bool `json:",omitempty"`
+ Uses_qcom_bsp_legacy *bool `json:",omitempty"`
+ Uses_qti_camera_device *bool `json:",omitempty"`
+- Target_process_sdk_version_override *string `json:",omitempty"`
+- Device_support_hwfde *bool `json:",omitempty"`
+- Device_support_hwfde_perf *bool `json:",omitempty"`
+- Device_support_legacy_hwfde *bool `json:",omitempty"`
++ 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
+--- a/build/soong/soong_config.mk
++++ b/build/soong/soong_config.mk
+@@ -4,9 +4,6 @@ _contents := $(_contents) "Bliss":{$(newline)
+
+ # See build/core/soong_config.mk for the add_json_* functions you can use here.
+ $(call add_json_str_omitempty, Additional_gralloc_10_usage_bits, $(TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS))
+-$(call add_json_bool, Device_support_hwfde, $(filter true,$(TARGET_HW_DISK_ENCRYPTION)))
+-$(call add_json_bool, Device_support_hwfde_perf, $(filter true,$(TARGET_HW_DISK_ENCRYPTION_PERF)))
+-$(call add_json_bool, Device_support_legacy_hwfde, $(filter true,$(TARGET_LEGACY_HW_DISK_ENCRYPTION)))
+ $(call add_json_bool, Has_legacy_camera_hal1, $(filter true,$(TARGET_HAS_LEGACY_CAMERA_HAL1)))
+ $(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
+