blob: b775e7009bd3bda151aba8d057cc0e78af578543 [file] [log] [blame]
Jackeaglea76b7262019-05-03 14:53:47 +02001From d45a6046c187c16f912d6250d0bd7dae0e06e83e Mon Sep 17 00:00:00 2001
Jackeagle1cba4132018-12-19 17:08:24 +01002From: Jackeagle <jackeagle102@gmail.com>
3Date: Wed, 19 Dec 2018 17:07:12 +0100
Jackeaglea76b7262019-05-03 14:53:47 +02004Subject: [PATCH 09/17] Revert "soong_config: Add flag for legacy HW FDE"
Jackeagle1cba4132018-12-19 17:08:24 +01005
6This reverts commit b9c76da9c82d09514aeaaf74a13ed6c5bc32dfcb.
7---
8 build/soong/android/variable.go | 16 +---------------
9 build/soong/soong_config.mk | 3 ---
10 2 files changed, 1 insertion(+), 18 deletions(-)
11
12diff --git a/build/soong/android/variable.go b/build/soong/android/variable.go
Jackeaglea76b7262019-05-03 14:53:47 +020013index 01235217..c11ec958 100644
Jackeagle1cba4132018-12-19 17:08:24 +010014--- a/build/soong/android/variable.go
15+++ b/build/soong/android/variable.go
16@@ -25,17 +25,6 @@ type Product_variables struct {
17 Target_process_sdk_version_override struct {
18 Cppflags []string
19 }
20- Device_support_hwfde struct {
21- Cflags []string
22- Header_libs []string
23- Shared_libs []string
24- }
25- Device_support_hwfde_perf struct {
26- Cflags []string
27- }
28- Device_support_legacy_hwfde struct {
29- Cflags []string
30- }
31 }
32
33 type ProductVariables struct {
34@@ -47,8 +36,5 @@ type ProductVariables struct {
35 Uses_nvidia_enhancements *bool `json:",omitempty"`
36 Uses_qcom_bsp_legacy *bool `json:",omitempty"`
37 Uses_qti_camera_device *bool `json:",omitempty"`
38- Target_process_sdk_version_override *string `json:",omitempty"`
39- Device_support_hwfde *bool `json:",omitempty"`
40- Device_support_hwfde_perf *bool `json:",omitempty"`
41- Device_support_legacy_hwfde *bool `json:",omitempty"`
42+ Target_process_sdk_version_override *string `json:",omitempty"`
43 }
44diff --git a/build/soong/soong_config.mk b/build/soong/soong_config.mk
Jackeaglea76b7262019-05-03 14:53:47 +020045index c31cb22d..d4ea7877 100644
Jackeagle1cba4132018-12-19 17:08:24 +010046--- a/build/soong/soong_config.mk
47+++ b/build/soong/soong_config.mk
48@@ -4,9 +4,6 @@ _contents := $(_contents) "Bliss":{$(newline)
49
50 # See build/core/soong_config.mk for the add_json_* functions you can use here.
51 $(call add_json_str_omitempty, Additional_gralloc_10_usage_bits, $(TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS))
52-$(call add_json_bool, Device_support_hwfde, $(filter true,$(TARGET_HW_DISK_ENCRYPTION)))
53-$(call add_json_bool, Device_support_hwfde_perf, $(filter true,$(TARGET_HW_DISK_ENCRYPTION_PERF)))
54-$(call add_json_bool, Device_support_legacy_hwfde, $(filter true,$(TARGET_LEGACY_HW_DISK_ENCRYPTION)))
55 $(call add_json_bool, Has_legacy_camera_hal1, $(filter true,$(TARGET_HAS_LEGACY_CAMERA_HAL1)))
56 $(call add_json_str, Specific_camera_parameter_library, $(TARGET_SPECIFIC_CAMERA_PARAMETER_LIBRARY))
57 $(call add_json_str_omitempty, Target_shim_libs, $(TARGET_LD_SHIM_LIBS))
58--
Jackeaglea76b7262019-05-03 14:53:47 +0200592.21.0
Jackeagle1cba4132018-12-19 17:08:24 +010060