diff --git a/build/soong/android/variable.go b/build/soong/android/variable.go index 0457f352..7d60211f 100644 --- a/build/soong/android/variable.go +++ b/build/soong/android/variable.go @@ -26,6 +26,9 @@ type Product_variables struct { Supports_legacy_hw_fde struct { Cflags []string } + Target_init_vendor_lib struct { + Whole_static_libs []string + } Target_process_sdk_version_override struct { Cppflags []string } @@ -80,7 +83,8 @@ type ProductVariables struct { Supports_hw_fde *bool `json:",omitempty"` Supports_hw_fde_perf *bool `json:",omitempty"` Supports_legacy_hw_fde *bool `json:",omitempty"` - Target_process_sdk_version_override *string `json:",omitempty"` + Target_init_vendor_lib *string `json:",omitempty"` + Target_process_sdk_version_override *string `json:",omitempty"` Target_shim_libs *string `json:",omitempty"` Uses_generic_camera_parameter_library *bool `json:",omitempty"` Uses_metadata_as_fde_key *bool `json:",omitempty"` diff --git a/build/soong/soong_config.mk b/build/soong/soong_config.mk index b682af9c..b5b753e0 100644 --- a/build/soong/soong_config.mk +++ b/build/soong/soong_config.mk @@ -13,6 +13,7 @@ $(call add_json_str, Specific_camera_parameter_library, $(TARGET_SPECIFIC_CAMERA $(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_str_omitempty, Target_init_vendor_lib, $(TARGET_INIT_VENDOR_LIB)) $(call add_json_str_omitempty, Target_process_sdk_version_override, $(TARGET_PROCESS_SDK_VERSION_OVERRIDE)) $(call add_json_str_omitempty, Target_shim_libs, $(subst $(space),:,$(TARGET_LD_SHIM_LIBS))) $(call add_json_bool, Uses_generic_camera_parameter_library, $(if $(TARGET_SPECIFIC_CAMERA_PARAMETER_LIBRARY),,true))