Alphabetize defines in generated SkUserConfig.

platform_tools/android/bin/gyp_to_android.py

 #!/usr/bin/python
 
 # Copyright 2014 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 Script for generating the Android framework's version of Skia from gyp
 files.
@@ skipping 111 matching lines @@
     # Create SkUserConfig
     user_config = os.path.join(SKIA_DIR, 'include', 'config', 'SkUserConfig.h')
     if target_dir:
       dst_dir = target_dir
     else:
       dst_dir = os.path.join(SKIA_DIR, 'include', 'core')
 
     generate_user_config.generate_user_config(
         original_sk_user_config=user_config,
         require_sk_user_config=require_sk_user_config, target_dir=dst_dir,
-        ordered_set=common.DEFINES)
+        defines=common.DEFINES)
 
     tool_makefile_writer.generate_tool(gyp_dir=tmp_folder,
                                        target_file='tests.gyp',
                                        skia_trunk=target_dir,
                                        dest_dir='tests',
                                        skia_lib_var_dict=common,
                                        local_module_name='skia_test',
                                        local_module_tags=['tests'],
                                        desired_targets=['tests'])
 
@@ skipping 57 matching lines @@
                                                                'arm64'))
 
     makefile_writer.write_android_mk(target_dir=target_dir,
         common=common, deviations_from_common=deviations_from_common)
 
   finally:
     shutil.rmtree(tmp_folder)
 
 if __name__ == '__main__':
   main()