Merge "Add new AboutBliss app" into p9.0
diff --git a/build/soong/android/variable.go b/build/soong/android/variable.go
index 67452c7..3dbf71d 100644
--- a/build/soong/android/variable.go
+++ b/build/soong/android/variable.go
@@ -3,6 +3,9 @@
Additional_gralloc_10_usage_bits struct {
Cppflags []string
}
+ Device_support_wait_for_qsee struct {
+ Cflags []string
+ }
Has_legacy_camera_hal1 struct {
Cflags []string
}
@@ -12,6 +15,9 @@
Uses_generic_camera_parameter_library struct {
Srcs []string
}
+ Uses_metadata_as_fde_key struct {
+ Cflags []string
+ }
Uses_nvidia_enhancements struct {
Cppflags []string
}
@@ -22,37 +28,38 @@
Cppflags []string
Shared_libs []string
}
- Target_process_sdk_version_override struct {
- Cppflags []string
+ Should_skip_waiting_for_qsee struct {
+ Cflags []string
}
- Device_support_hwfde struct {
- Cflags []string
+ Supports_hw_fde struct {
+ Cflags []string
Header_libs []string
Shared_libs []string
}
- Device_support_hwfde_perf struct {
+ Supports_hw_fde_perf struct {
Cflags []string
}
- Device_support_legacy_hwfde struct {
+ Supports_legacy_hw_fde struct {
Cflags []string
}
- Device_support_wait_for_qsee struct {
- Cflags []string
+ Target_process_sdk_version_override struct {
+ Cppflags []string
}
}
type ProductVariables struct {
Additional_gralloc_10_usage_bits *string `json:",omitempty"`
Has_legacy_camera_hal1 *bool `json:",omitempty"`
+ Should_skip_waiting_for_qsee *bool `json:",omitempty"`
Specific_camera_parameter_library *string `json:",omitempty"`
+ Supports_hw_fde *bool `json:",omitempty"`
+ Supports_hw_fde_perf *bool `json:",omitempty"`
+ Supports_legacy_hw_fde *bool `json:",omitempty"`
Target_shim_libs *string `json:",omitempty"`
Uses_generic_camera_parameter_library *bool `json:",omitempty"`
+ Uses_metadata_as_fde_key *bool `json:",omitempty"`
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"`
- Device_support_wait_for_qsee *bool `json:",omitempty"`
}
diff --git a/build/soong/soong_config.mk b/build/soong/soong_config.mk
index 91e0b41..454793e 100644
--- a/build/soong/soong_config.mk
+++ b/build/soong/soong_config.mk
@@ -4,17 +4,18 @@
# 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, 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))
$(call add_json_bool, Uses_generic_camera_parameter_library, $(if $(TARGET_SPECIFIC_CAMERA_PARAMETER_LIBRARY),false,true))
-$(call add_json_bool, Uses_nvidia_enhancements, $(filter TRUE,$(NV_ANDROID_FRAMEWORK_ENHANCEMENTS)))
-$(call add_json_bool, Uses_qcom_bsp_legacy, $(filter true,$(TARGET_USES_QCOM_BSP_LEGACY)))
-$(call add_json_bool, Uses_qti_camera_device, $(filter true,$(TARGET_USES_QTI_CAMERA_DEVICE)))
+$(call add_json_bool, Supports_hw_fde, $(filter true,$(TARGET_HW_DISK_ENCRYPTION)))
+$(call add_json_bool, Supports_hw_fde_perf, $(filter true,$(TARGET_HW_DISK_ENCRYPTION_PERF)))
+$(call add_json_bool, Supports_legacy_hw_fde, $(filter true,$(TARGET_LEGACY_HW_DISK_ENCRYPTION)))
+$(call add_json_bool, Should_skip_waiting_for_qsee, $(filter true,$(TARGET_KEYMASTER_SKIP_WAITING_FOR_QSEE)))
+$(call add_json_bool, Uses_metadata_as_fde_key, $(filter true,$(TARGET_USES_METADATA_AS_FDE_KEY)))
+$(call add_json_bool, Uses_nvidia_enhancements, $(filter TRUE,$(NV_ANDROID_FRAMEWORK_ENHANCEMENTS)))
+$(call add_json_bool, Uses_qcom_bsp_legacy, $(filter true,$(TARGET_USES_QCOM_BSP_LEGACY)))
+$(call add_json_bool, Uses_qti_camera_device, $(filter true,$(TARGET_USES_QTI_CAMERA_DEVICE)))
$(call add_json_str_omitempty, Target_process_sdk_version_override, $(TARGET_PROCESS_SDK_VERSION_OVERRIDE))
# This causes the build system to strip out the last comma in our nested struct, to keep the JSON valid.