| Jackeagle | 1cba413 | 2018-12-19 17:08:24 +0100 | [diff] [blame^] | 1 | From e9a1c2d62bc123e66ac785f48b86334e33190fdf Mon Sep 17 00:00:00 2001 |
| 2 | From: Jackeagle <jackeagle102@gmail.com> |
| 3 | Date: Wed, 19 Dec 2018 17:07:12 +0100 |
| 4 | Subject: [PATCH 11/11] Revert "soong_config: Add flag for legacy HW FDE" |
| 5 | |
| 6 | This 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 | |
| 12 | diff --git a/build/soong/android/variable.go b/build/soong/android/variable.go |
| 13 | index 0123521..c11ec95 100644 |
| 14 | --- 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 | } |
| 44 | diff --git a/build/soong/soong_config.mk b/build/soong/soong_config.mk |
| 45 | index c31cb22..d4ea787 100644 |
| 46 | --- 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 | -- |
| 59 | 2.17.1 |
| 60 | |