blob: f19d8104ead59cfe4a589c81ceed5f7a0abe3580 [file] [log] [blame]
Jackeaglea76b7262019-05-03 14:53:47 +02001From 9cd22c7495ff6865ec764ac83ce49c7bfda86fc4 Mon Sep 17 00:00:00 2001
Jackeagle1cba4132018-12-19 17:08:24 +01002From: Jackeagle <jackeagle102@gmail.com>
3Date: Wed, 19 Dec 2018 17:06:59 +0100
Jackeaglea76b7262019-05-03 14:53:47 +02004Subject: [PATCH 08/17] Revert "soong_config: Add flag for crypto waiting on
Jackeagle1cba4132018-12-19 17:08:24 +01005 QSEE to start"
6
7This reverts commit 9ce6d1fa37b1bf4ac78f9fcd10302820f8161565.
8---
9 build/soong/android/variable.go | 4 ----
10 build/soong/soong_config.mk | 1 -
11 2 files changed, 5 deletions(-)
12
13diff --git a/build/soong/android/variable.go b/build/soong/android/variable.go
Jackeaglea76b7262019-05-03 14:53:47 +020014index 67452c73..01235217 100644
Jackeagle1cba4132018-12-19 17:08:24 +010015--- a/build/soong/android/variable.go
16+++ b/build/soong/android/variable.go
17@@ -36,9 +36,6 @@ type Product_variables struct {
18 Device_support_legacy_hwfde struct {
19 Cflags []string
20 }
21- Device_support_wait_for_qsee struct {
22- Cflags []string
23- }
24 }
25
26 type ProductVariables struct {
27@@ -54,5 +51,4 @@ type ProductVariables struct {
28 Device_support_hwfde *bool `json:",omitempty"`
29 Device_support_hwfde_perf *bool `json:",omitempty"`
30 Device_support_legacy_hwfde *bool `json:",omitempty"`
31- Device_support_wait_for_qsee *bool `json:",omitempty"`
32 }
33diff --git a/build/soong/soong_config.mk b/build/soong/soong_config.mk
Jackeaglea76b7262019-05-03 14:53:47 +020034index 91e0b417..c31cb22d 100644
Jackeagle1cba4132018-12-19 17:08:24 +010035--- a/build/soong/soong_config.mk
36+++ b/build/soong/soong_config.mk
37@@ -7,7 +7,6 @@ $(call add_json_str_omitempty, Additional_gralloc_10_usage_bits, $(TARGET_ADDITI
38 $(call add_json_bool, Device_support_hwfde, $(filter true,$(TARGET_HW_DISK_ENCRYPTION)))
39 $(call add_json_bool, Device_support_hwfde_perf, $(filter true,$(TARGET_HW_DISK_ENCRYPTION_PERF)))
40 $(call add_json_bool, Device_support_legacy_hwfde, $(filter true,$(TARGET_LEGACY_HW_DISK_ENCRYPTION)))
41-$(call add_json_bool, Device_support_wait_for_qsee, $(filter true,$(TARGET_KEYMASTER_WAIT_FOR_QSEE)))
42 $(call add_json_bool, Has_legacy_camera_hal1, $(filter true,$(TARGET_HAS_LEGACY_CAMERA_HAL1)))
43 $(call add_json_str, Specific_camera_parameter_library, $(TARGET_SPECIFIC_CAMERA_PARAMETER_LIBRARY))
44 $(call add_json_str_omitempty, Target_shim_libs, $(TARGET_LD_SHIM_LIBS))
45--
Jackeaglea76b7262019-05-03 14:53:47 +0200462.21.0
Jackeagle1cba4132018-12-19 17:08:24 +010047