Sort soong variables alphabetically
Change-Id: I880b07972fefb7fa2b40ab4aeacd073fb9a942b4
diff --git a/build/soong/android/variable.go b/build/soong/android/variable.go
index 753c884..d137d0e 100644
--- a/build/soong/android/variable.go
+++ b/build/soong/android/variable.go
@@ -31,21 +31,21 @@
Supports_hw_fde_perf struct {
Cflags []string
}
+ Target_ignores_ftp_pptp_conntrack_failure struct {
+ Cppflags []string
+ }
Target_init_vendor_lib struct {
Whole_static_libs []string
}
+ Target_needs_netd_direct_connect_rule struct {
+ Cppflags []string
+ }
Target_process_sdk_version_override struct {
Cppflags []string
}
Target_shim_libs struct {
Cppflags []string
}
- 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
}
@@ -66,17 +66,17 @@
Apply_msm8974_1440p_egl_workaround *bool `json:",omitempty"`
Bootloader_message_offset *int `json:",omitempty"`
Has_legacy_camera_hal1 *bool `json:",omitempty"`
+ Recovery_skip_ev_rel_input *bool `json:",omitempty"`
Should_wait_for_qsee *bool `json:",omitempty"`
Specific_camera_parameter_library *string `json:",omitempty"`
Supports_extended_compress_format *bool `json:",omitempty"`
- Recovery_skip_ev_rel_input *bool `json:",omitempty"`
Supports_hw_fde *bool `json:",omitempty"`
Supports_hw_fde_perf *bool `json:",omitempty"`
+ Target_ignores_ftp_pptp_conntrack_failure *bool `json:",omitempty"`
Target_init_vendor_lib *string `json:",omitempty"`
+ Target_needs_netd_direct_connect_rule *bool `json:",omitempty"`
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 0fca8ed..5136a87 100644
--- a/build/soong/soong_config.mk
+++ b/build/soong/soong_config.mk
@@ -14,11 +14,11 @@
$(call add_json_bool, Supports_extended_compress_format, $(filter true,$(AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT)))
$(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, Target_ignores_ftp_pptp_conntrack_failure, $(filter true,$(TARGET_IGNORES_FTP_PPTP_CONNTRACK_FAILURE)))
$(call add_json_str_omitempty, Target_init_vendor_lib, $(TARGET_INIT_VENDOR_LIB))
+$(call add_json_bool, Target_needs_netd_direct_connect_rule, $(filter true,$(TARGET_NEEDS_NETD_DIRECT_CONNECT_RULE)))
$(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)))