lineage: Sort soong variables and configurations
Change-Id: I4a191f8ce61123e30f780f8e39411a7723fb6197
diff --git a/build/soong/android/variable.go b/build/soong/android/variable.go
index 85f7dee..781f3bf 100644
--- a/build/soong/android/variable.go
+++ b/build/soong/android/variable.go
@@ -3,21 +3,21 @@
Needs_text_relocations struct {
Cppflags []string
}
+ Target_shim_libs struct {
+ Cppflags []string
+ }
Uses_generic_camera_parameter_library struct {
Srcs []string
}
Uses_qcom_bsp_legacy struct {
Cppflags []string
}
- Target_shim_libs struct {
- Cppflags []string
- }
}
type ProductVariables struct {
- Uses_generic_camera_parameter_library *bool `json:",omitempty"`
- Specific_camera_parameter_library *string `json:",omitempty"`
Needs_text_relocations *bool `json:",omitempty"`
- Uses_qcom_bsp_legacy *bool `json:",omitempty"`
+ Specific_camera_parameter_library *string `json:",omitempty"`
Target_shim_libs *string `json:",omitempty"`
+ Uses_generic_camera_parameter_library *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 e8b161b..27f1eb8 100644
--- a/build/soong/soong_config.mk
+++ b/build/soong/soong_config.mk
@@ -4,10 +4,10 @@
$(hide) (\
echo '{'; \
echo '"Lineage": {'; \
- echo ' "Uses_generic_camera_parameter_library": $(if $(TARGET_SPECIFIC_CAMERA_PARAMETER_LIBRARY),false,true),'; \
- echo ' "Specific_camera_parameter_library": "$(TARGET_SPECIFIC_CAMERA_PARAMETER_LIBRARY)",'; \
echo ' "Needs_text_relocations": $(if $(filter true,$(TARGET_NEEDS_PLATFORM_TEXT_RELOCATIONS)),true,false),'; \
- echo ' "Uses_qcom_bsp_legacy": $(if $(filter true,$(TARGET_USES_QCOM_BSP_LEGACY)),true,false),'; \
- echo ' "Target_shim_libs": "$(subst $(space),:,$(TARGET_LD_SHIM_LIBS))"'; \
+ echo ' "Specific_camera_parameter_library": "$(TARGET_SPECIFIC_CAMERA_PARAMETER_LIBRARY)",'; \
+ echo ' "Target_shim_libs": "$(subst $(space),:,$(TARGET_LD_SHIM_LIBS))",'; \
+ echo ' "Uses_generic_camera_parameter_library": $(if $(TARGET_SPECIFIC_CAMERA_PARAMETER_LIBRARY),false,true),'; \
+ echo ' "Uses_qcom_bsp_legacy": $(if $(filter true,$(TARGET_USES_QCOM_BSP_LEGACY)),true,false)'; \
echo '},'; \
echo '') > $(SOONG_VARIABLES_TMP)