Alphabetize defines in generated SkUserConfig.

When generating SkUserConfig.h for Android, alphabetize the defines.

This will make one merge much harder to look at, but every following
one much easier.

R=mtklein@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/388693003

5 files changed, 9 insertions, 10 deletions

diff --git a/platform_tools/android/bin/gyp_to_android.py b/platform_tools/android/bin/gyp_to_android.py
index 2f2b24d4fd..8083785744 100755
--- a/platform_tools/android/bin/gyp_to_android.py
+++ b/platform_tools/android/bin/gyp_to_android.py
@@ -129,7 +129,7 @@ def main(target_dir=None, require_sk_user_config=False):
     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',
diff --git a/platform_tools/android/gyp_gen/generate_user_config.py b/platform_tools/android/gyp_gen/generate_user_config.py
index 957c363f02..6858d9372f 100644
--- a/platform_tools/android/gyp_gen/generate_user_config.py
+++ b/platform_tools/android/gyp_gen/generate_user_config.py
@@ -29,7 +29,7 @@ BUILD_GUARD = 'SkUserConfig_Android_DEFINED'
 
 
 def generate_user_config(original_sk_user_config, require_sk_user_config,
-                         target_dir, ordered_set):
+                         target_dir, defines):
   """Generate the SkUserConfig file specific to the Android framework.
 
   Android needs its #defines in its skia/include/core directory, so that other
@@ -48,8 +48,7 @@ def generate_user_config(original_sk_user_config, require_sk_user_config,
           written. Its name will be the same basename as
           original_sk_user_config. If None, the new file will be written to the
           working directory.
-      ordered_set: A vars_dict_lib.OrderedSet, containing a list of defines to
-          be appended to SkUserConfig.
+      defines: Iterable of defines to be appended to SkUserConfig.
 
   Raises:
       AssertionError: If original_sk_user_config does not exist.
@@ -95,7 +94,7 @@ def generate_user_config(original_sk_user_config, require_sk_user_config,
     dst.write('#endif\n\n')
 
     # Now add the defines from the gyp files.
-    for item in ordered_set:
+    for item in sorted(defines):
       # Although our defines may have '=' in them, when written to the header
       # there should be a space between the macro and what it replaces.
       dst.write('#define ' + item.replace('=', ' ') + '\n')
diff --git a/platform_tools/android/tests/expectations/SkUserConfig-h.txt b/platform_tools/android/tests/expectations/SkUserConfig-h.txt
index 78b69a44b2..a9f6a0c0fa 100644
--- a/platform_tools/android/tests/expectations/SkUserConfig-h.txt
+++ b/platform_tools/android/tests/expectations/SkUserConfig-h.txt
@@ -37,7 +37,7 @@
 #define SK_BUILD_FOR_ANDROID
 #define SK_BUILD_FOR_ANDROID_FRAMEWORK
 #define SK_SCALAR_IS_FLOAT
-#define foo
 #define bar
+#define foo
 
 #endif // SkUserConfig_Android_DEFINED
diff --git a/platform_tools/android/tests/expectations/missing-filename.xxx b/platform_tools/android/tests/expectations/missing-filename.xxx
index d0d70d7792..7c5319cb94 100644
--- a/platform_tools/android/tests/expectations/missing-filename.xxx
+++ b/platform_tools/android/tests/expectations/missing-filename.xxx
@@ -27,7 +27,7 @@
 #define SK_BUILD_FOR_ANDROID
 #define SK_BUILD_FOR_ANDROID_FRAMEWORK
 #define SK_SCALAR_IS_FLOAT
-#define foo
 #define bar
+#define foo
 
 #endif // SkUserConfig_Android_DEFINED
diff --git a/platform_tools/android/tests/generate_user_config_tests.py b/platform_tools/android/tests/generate_user_config_tests.py
index 660757d2be..90689a6238 100644
--- a/platform_tools/android/tests/generate_user_config_tests.py
+++ b/platform_tools/android/tests/generate_user_config_tests.py
@@ -41,7 +41,7 @@ def generate_dummy_user_config(original_sk_user_config,
               'bar' ]
   gen_config(original_sk_user_config=original_sk_user_config,
              require_sk_user_config=require_sk_user_config,
-             target_dir=target_dir, ordered_set=defines)
+             target_dir=target_dir, defines=defines)
 
 
 class GenUserConfigTest(unittest.TestCase):
@@ -55,10 +55,10 @@ class GenUserConfigTest(unittest.TestCase):
     # With require_sk_user_config set to True, an AssertionError will be
     # thrown when original_sk_user_config is missing.
     with self.assertRaises(AssertionError):
-      ordered_set = [ 'define' ]
+      defines = [ 'define' ]
       gen_config(original_sk_user_config=original,
                  require_sk_user_config=True,
-                 target_dir=tmp, ordered_set=ordered_set)
+                 target_dir=tmp, defines=defines)
 
     # With require_sk_user_config set to False, it is okay for
     # original_sk_user_config to be missing.