From 119f9d1759ff4b078cd945600dd11beff955bf14 Mon Sep 17 00:00:00 2001 From: dianlujitao Date: Tue, 8 Oct 2019 14:46:58 +0800 Subject: [PATCH] soong_config: Reverse wait for qsee flag * Disabled by QCOM on P and onwards Change-Id: I3f27d399293a95ad75446482c8711adf5fed1f78 --- build/soong/android/variable.go | 4 ++-- build/soong/soong_config.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/soong/android/variable.go b/build/soong/android/variable.go index a8332c10..39008d8e 100644 --- a/build/soong/android/variable.go +++ b/build/soong/android/variable.go @@ -14,7 +14,7 @@ type Product_variables struct { Overrides []string Shared_libs []string } - Should_skip_waiting_for_qsee struct { + Should_wait_for_qsee struct { Cflags []string } Supports_hw_fde struct { @@ -74,7 +74,7 @@ type ProductVariables struct { Apply_msm8974_1440p_egl_workaround *bool `json:",omitempty"` Bootloader_message_offset *int `json:",omitempty"` Has_legacy_camera_hal1 *bool `json:",omitempty"` - Should_skip_waiting_for_qsee *bool `json:",omitempty"` + Should_wait_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"` diff --git a/build/soong/soong_config.mk b/build/soong/soong_config.mk index f3b3406c..e6d43d78 100644 --- a/build/soong/soong_config.mk +++ b/build/soong/soong_config.mk @@ -8,7 +8,7 @@ $(call add_json_str_omitempty, Additional_gralloc_10_usage_bits, $(TARGET_ADDITI $(call add_json_bool, Apply_msm8974_1440p_egl_workaround, $(filter true,$(TARGET_MSM8974_1440P_EGL_WORKAROUND))) $(call add_json_val_default, Bootloader_message_offset, $(BOOTLOADER_MESSAGE_OFFSET), 0) $(call add_json_bool, Has_legacy_camera_hal1, $(filter true,$(TARGET_HAS_LEGACY_CAMERA_HAL1))) -$(call add_json_bool, Should_skip_waiting_for_qsee, $(filter true,$(TARGET_KEYMASTER_SKIP_WAITING_FOR_QSEE))) +$(call add_json_bool, Should_wait_for_qsee, $(filter true,$(TARGET_KEYMASTER_WAIT_FOR_QSEE))) $(call add_json_str, Specific_camera_parameter_library, $(TARGET_SPECIFIC_CAMERA_PARAMETER_LIBRARY)) $(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)))