diff --git a/build/soong/android/variable.go b/build/soong/android/variable.go index 32407d6d..ee19c263 100644 --- a/build/soong/android/variable.go +++ b/build/soong/android/variable.go @@ -40,6 +40,9 @@ type Product_variables struct { Target_needs_netd_direct_connect_rule struct { Cppflags []string } + Target_ignores_ftp_pptp_conntrack_failure struct { + Cppflags []string + } Uses_generic_camera_parameter_library struct { Srcs []string } @@ -69,6 +72,7 @@ type ProductVariables struct { Target_process_sdk_version_override *string `json:",omitempty"` Target_shim_libs *string `json:",omitempty"` Target_needs_netd_direct_connect_rule *bool `json:",omitempty"` + Target_ignores_ftp_pptp_conntrack_failure *bool `json:",omitempty"` Uses_generic_camera_parameter_library *bool `json:",omitempty"` Uses_nvidia_enhancements *bool `json:",omitempty"` Uses_qcom_bsp_legacy *bool `json:",omitempty"` diff --git a/build/soong/soong_config.mk b/build/soong/soong_config.mk index a72a844c..afdc29c6 100644 --- a/build/soong/soong_config.mk +++ b/build/soong/soong_config.mk @@ -17,6 +17,7 @@ $(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, Target_needs_netd_direct_connect_rule, $(filter true,$(TARGET_NEEDS_NETD_DIRECT_CONNECT_RULE))) +$(call add_json_bool, Target_ignores_ftp_pptp_conntrack_failure, $(filter true,$(TARGET_IGNORES_FTP_PPTP_CONNTRACK_FAILURE))) $(call add_json_bool, Uses_generic_camera_parameter_library, $(if $(TARGET_SPECIFIC_CAMERA_PARAMETER_LIBRARY),,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)))