[NaCl SDK] Add script to sort sdk filelist

The SDK file list is fairly large and we like to keep
it sorted.  This change adds a --sort option to the
verify_filelist.py script.

R=binji@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210448 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 202 insertions, 169 deletions

diff --git a/native_client_sdk/src/build_tools/sdk_files.list b/native_client_sdk/src/build_tools/sdk_files.list
index 373243a..bb94148 100644
--- a/native_client_sdk/src/build_tools/sdk_files.list
+++ b/native_client_sdk/src/build_tools/sdk_files.list
@@ -101,8 +101,8 @@ examples/api/websocket/index.html
 examples/api/websocket/Makefile
 examples/api/websocket/manifest.json
 examples/api/websocket/websocket.cc
-examples/button_close_hover.png
 examples/button_close.png
+examples/button_close_hover.png
 examples/demo/drive/background.js
 examples/demo/drive/common.js
 examples/demo/drive/drive.cc
@@ -112,21 +112,17 @@ examples/demo/drive/index.html
 [win]examples/demo/drive/make.bat
 examples/demo/drive/Makefile
 examples/demo/drive/manifest.json
-[win]examples/demo/make.bat
-examples/demo/Makefile
 examples/demo/earth/background.js
 examples/demo/earth/common.js
+examples/demo/earth/earth.cc
+examples/demo/earth/earth.jpg
+examples/demo/earth/earthnight.jpg
 examples/demo/earth/example.js
 examples/demo/earth/icon128.png
 examples/demo/earth/index.html
-examples/demo/earth/Makefile
 [win]examples/demo/earth/make.bat
+examples/demo/earth/Makefile
 examples/demo/earth/manifest.json
-examples/demo/earth/earth.cc
-examples/demo/earth/earth.jpg
-examples/demo/earth/earthnight.jpg
-[win]examples/demo/flock/make.bat
-examples/demo/flock/Makefile
 examples/demo/flock/background.js
 examples/demo/flock/common.js
 examples/demo/flock/flock.cc
@@ -135,18 +131,22 @@ examples/demo/flock/goose.h
 examples/demo/flock/icon128.png
 examples/demo/flock/images/flock_green.raw
 examples/demo/flock/index.html
+[win]examples/demo/flock/make.bat
+examples/demo/flock/Makefile
 examples/demo/flock/manifest.json
 examples/demo/flock/sprite.cc
 examples/demo/flock/sprite.h
 examples/demo/flock/vector2.h
-[win]examples/demo/life/make.bat
-examples/demo/life/Makefile
 examples/demo/life/background.js
 examples/demo/life/common.js
 examples/demo/life/icon128.png
 examples/demo/life/index.html
 examples/demo/life/life.c
+[win]examples/demo/life/make.bat
+examples/demo/life/Makefile
 examples/demo/life/manifest.json
+[win]examples/demo/make.bat
+examples/demo/Makefile
 examples/demo/nacl_io/background.js
 examples/demo/nacl_io/common.js
 examples/demo/nacl_io/example.js
@@ -175,31 +175,31 @@ examples/demo/voronoi/common.js
 examples/demo/voronoi/example.js
 examples/demo/voronoi/icon128.png
 examples/demo/voronoi/index.html
-examples/demo/voronoi/Makefile
 [win]examples/demo/voronoi/make.bat
+examples/demo/voronoi/Makefile
 examples/demo/voronoi/manifest.json
 examples/demo/voronoi/voronoi.cc
 examples/favicon.ico
-[win]examples/getting_started/hello_world/make.bat
-examples/getting_started/hello_world/Makefile
-examples/getting_started/hello_world/manifest.json
 examples/getting_started/hello_world/background.js
 examples/getting_started/hello_world/common.js
 examples/getting_started/hello_world/example.js
 examples/getting_started/hello_world/hello_world.c
 examples/getting_started/hello_world/icon128.png
 examples/getting_started/hello_world/index.html
-[win]examples/getting_started/simple_hello_world/make.bat
-examples/getting_started/simple_hello_world/Makefile
-examples/getting_started/simple_hello_world/manifest.json
+[win]examples/getting_started/hello_world/make.bat
+examples/getting_started/hello_world/Makefile
+examples/getting_started/hello_world/manifest.json
+[win]examples/getting_started/make.bat
+examples/getting_started/Makefile
 examples/getting_started/simple_hello_world/background.js
 examples/getting_started/simple_hello_world/common.js
 examples/getting_started/simple_hello_world/example.js
 examples/getting_started/simple_hello_world/hello_world.c
 examples/getting_started/simple_hello_world/icon128.png
 examples/getting_started/simple_hello_world/index.html
-[win]examples/getting_started/make.bat
-examples/getting_started/Makefile
+[win]examples/getting_started/simple_hello_world/make.bat
+examples/getting_started/simple_hello_world/Makefile
+examples/getting_started/simple_hello_world/manifest.json
 examples/httpd.cmd
 examples/index.css
 examples/index.html
@@ -241,8 +241,8 @@ examples/tutorial/load_progress/manifest.json
 examples/tutorial/Makefile
 include/error_handling/error_handling.h
 include/error_handling/string_stream.h
-include/GLES2/gl2ext.h
 include/GLES2/gl2.h
+include/GLES2/gl2ext.h
 include/GLES2/gl2platform.h
 include/json/assertions.h
 include/json/autolink.h
@@ -263,14 +263,14 @@ include/nacl_io/kernel_object.h
 include/nacl_io/kernel_proxy.h
 include/nacl_io/kernel_wrap.h
 include/nacl_io/kernel_wrap_real.h
-include/nacl_io/mount_dev.h
 include/nacl_io/mount.h
+include/nacl_io/mount_dev.h
 include/nacl_io/mount_factory.h
 include/nacl_io/mount_html5fs.h
 include/nacl_io/mount_http.h
 include/nacl_io/mount_mem.h
-include/nacl_io/mount_node_dir.h
 include/nacl_io/mount_node.h
+include/nacl_io/mount_node_dir.h
 include/nacl_io/mount_node_html5fs.h
 include/nacl_io/mount_node_http.h
 include/nacl_io/mount_node_mem.h
@@ -286,11 +286,15 @@ include/nacl_io/osutime.h
 include/nacl_io/path.h
 include/nacl_io/pepper/all_interfaces.h
 include/nacl_io/pepper/define_empty_macros.h
-include/nacl_io/pepper_interface.h
 include/nacl_io/pepper/undef_macros.h
+include/nacl_io/pepper_interface.h
 include/nacl_io/real_pepper_interface.h
 include/nacl_io/typed_mount_factory.h
 include/ppapi/c/dev/deprecated_bool.h
+include/ppapi/c/dev/pp_cursor_type_dev.h
+include/ppapi/c/dev/pp_print_settings_dev.h
+include/ppapi/c/dev/pp_video_capture_dev.h
+include/ppapi/c/dev/pp_video_dev.h
 include/ppapi/c/dev/ppb_audio_input_dev.h
 include/ppapi/c/dev/ppb_buffer_dev.h
 include/ppapi/c/dev/ppb_char_set_dev.h
@@ -320,12 +324,10 @@ include/ppapi/c/dev/ppb_video_decoder_dev.h
 include/ppapi/c/dev/ppb_view_dev.h
 include/ppapi/c/dev/ppb_widget_dev.h
 include/ppapi/c/dev/ppb_zoom_dev.h
-include/ppapi/c/dev/pp_cursor_type_dev.h
 include/ppapi/c/dev/ppp_class_deprecated.h
 include/ppapi/c/dev/ppp_find_dev.h
 include/ppapi/c/dev/ppp_network_state_dev.h
 include/ppapi/c/dev/ppp_printing_dev.h
-include/ppapi/c/dev/pp_print_settings_dev.h
 include/ppapi/c/dev/ppp_scrollbar_dev.h
 include/ppapi/c/dev/ppp_selection_dev.h
 include/ppapi/c/dev/ppp_text_input_dev.h
@@ -333,17 +335,31 @@ include/ppapi/c/dev/ppp_video_capture_dev.h
 include/ppapi/c/dev/ppp_video_decoder_dev.h
 include/ppapi/c/dev/ppp_widget_dev.h
 include/ppapi/c/dev/ppp_zoom_dev.h
-include/ppapi/c/dev/pp_video_capture_dev.h
-include/ppapi/c/dev/pp_video_dev.h
 include/ppapi/c/extensions/dev/ppb_ext_alarms_dev.h
 include/ppapi/c/extensions/dev/ppb_ext_events_dev.h
 include/ppapi/c/extensions/dev/ppb_ext_socket_dev.h
 include/ppapi/c/pp_array_output.h
-include/ppapi/cpp/array_output.h
-include/ppapi/cpp/audio_config.h
-include/ppapi/cpp/audio.h
-include/ppapi/c/ppb_audio_config.h
+include/ppapi/c/pp_bool.h
+include/ppapi/c/pp_completion_callback.h
+include/ppapi/c/pp_directory_entry.h
+include/ppapi/c/pp_errors.h
+include/ppapi/c/pp_file_info.h
+include/ppapi/c/pp_graphics_3d.h
+include/ppapi/c/pp_input_event.h
+include/ppapi/c/pp_instance.h
+include/ppapi/c/pp_macros.h
+include/ppapi/c/pp_module.h
+include/ppapi/c/pp_point.h
+include/ppapi/c/pp_rect.h
+include/ppapi/c/pp_resource.h
+include/ppapi/c/pp_size.h
+include/ppapi/c/pp_stdint.h
+include/ppapi/c/pp_time.h
+include/ppapi/c/pp_touch_point.h
+include/ppapi/c/pp_var.h
+include/ppapi/c/ppb.h
 include/ppapi/c/ppb_audio.h
+include/ppapi/c/ppb_audio_config.h
 include/ppapi/c/ppb_console.h
 include/ppapi/c/ppb_core.h
 include/ppapi/c/ppb_file_io.h
@@ -353,7 +369,6 @@ include/ppapi/c/ppb_fullscreen.h
 include/ppapi/c/ppb_gamepad.h
 include/ppapi/c/ppb_graphics_2d.h
 include/ppapi/c/ppb_graphics_3d.h
-include/ppapi/c/ppb.h
 include/ppapi/c/ppb_host_resolver.h
 include/ppapi/c/ppb_image_data.h
 include/ppapi/c/ppb_input_event.h
@@ -364,20 +379,24 @@ include/ppapi/c/ppb_mouse_cursor.h
 include/ppapi/c/ppb_mouse_lock.h
 include/ppapi/c/ppb_net_address.h
 include/ppapi/c/ppb_network_proxy.h
-include/ppapi/c/pp_bool.h
 include/ppapi/c/ppb_opengles2.h
 include/ppapi/c/ppb_tcp_socket.h
 include/ppapi/c/ppb_udp_socket.h
 include/ppapi/c/ppb_url_loader.h
 include/ppapi/c/ppb_url_request_info.h
 include/ppapi/c/ppb_url_response_info.h
-include/ppapi/c/ppb_var_array_buffer.h
+include/ppapi/c/ppb_var.h
 include/ppapi/c/ppb_var_array.h
+include/ppapi/c/ppb_var_array_buffer.h
 include/ppapi/c/ppb_var_dictionary.h
-include/ppapi/c/ppb_var.h
 include/ppapi/c/ppb_view.h
 include/ppapi/c/ppb_websocket.h
-include/ppapi/c/pp_completion_callback.h
+include/ppapi/c/ppp.h
+include/ppapi/c/ppp_graphics_3d.h
+include/ppapi/c/ppp_input_event.h
+include/ppapi/c/ppp_instance.h
+include/ppapi/c/ppp_messaging.h
+include/ppapi/c/ppp_mouse_lock.h
 include/ppapi/c/private/pp_file_handle.h
 include/ppapi/c/private/ppb_ext_crx_file_system_private.h
 include/ppapi/c/private/ppb_file_io_private.h
@@ -388,15 +407,9 @@ include/ppapi/c/private/ppb_tcp_server_socket_private.h
 include/ppapi/c/private/ppb_tcp_socket_private.h
 include/ppapi/c/private/ppb_udp_socket_private.h
 include/ppapi/c/private/ppb_x509_certificate_private.h
-include/ppapi/cpp/private/ext_crx_file_system_private.h
-include/ppapi/cpp/private/file_io_private.h
-include/ppapi/cpp/private/host_resolver_private.h
-include/ppapi/cpp/private/net_address_private.h
-include/ppapi/cpp/private/pass_file_handle.h
-include/ppapi/cpp/private/tcp_server_socket_private.h
-include/ppapi/cpp/private/tcp_socket_private.h
-include/ppapi/cpp/private/udp_socket_private.h
-include/ppapi/cpp/private/x509_certificate_private.h
+include/ppapi/cpp/array_output.h
+include/ppapi/cpp/audio.h
+include/ppapi/cpp/audio_config.h
 include/ppapi/cpp/completion_callback.h
 include/ppapi/cpp/core.h
 include/ppapi/cpp/dev/audio_input_dev.h
@@ -426,9 +439,7 @@ include/ppapi/cpp/dev/view_dev.h
 include/ppapi/cpp/dev/widget_client_dev.h
 include/ppapi/cpp/dev/widget_dev.h
 include/ppapi/cpp/dev/zoom_dev.h
-include/ppapi/c/pp_directory_entry.h
 include/ppapi/cpp/directory_entry.h
-include/ppapi/c/pp_errors.h
 include/ppapi/cpp/extensions/dev/alarms_dev.h
 include/ppapi/cpp/extensions/dev/events_dev.h
 include/ppapi/cpp/extensions/dev/socket_dev.h
@@ -438,28 +449,22 @@ include/ppapi/cpp/extensions/ext_output_traits.h
 include/ppapi/cpp/extensions/from_var_converter.h
 include/ppapi/cpp/extensions/optional.h
 include/ppapi/cpp/extensions/to_var_converter.h
-include/ppapi/c/pp_file_info.h
 include/ppapi/cpp/file_io.h
 include/ppapi/cpp/file_ref.h
 include/ppapi/cpp/file_system.h
 include/ppapi/cpp/fullscreen.h
 include/ppapi/cpp/graphics_2d.h
-include/ppapi/cpp/graphics_3d_client.h
-include/ppapi/c/pp_graphics_3d.h
 include/ppapi/cpp/graphics_3d.h
+include/ppapi/cpp/graphics_3d_client.h
 include/ppapi/cpp/host_resolver.h
 include/ppapi/cpp/image_data.h
-include/ppapi/c/pp_input_event.h
 include/ppapi/cpp/input_event.h
-include/ppapi/c/pp_instance.h
 include/ppapi/cpp/instance.h
 include/ppapi/cpp/instance_handle.h
 include/ppapi/cpp/logging.h
-include/ppapi/c/pp_macros.h
 include/ppapi/cpp/message_loop.h
-include/ppapi/cpp/module_embedder.h
-include/ppapi/c/pp_module.h
 include/ppapi/cpp/module.h
+include/ppapi/cpp/module_embedder.h
 include/ppapi/cpp/module_impl.h
 include/ppapi/cpp/mouse_cursor.h
 include/ppapi/cpp/mouse_lock.h
@@ -467,44 +472,33 @@ include/ppapi/cpp/net_address.h
 include/ppapi/cpp/network_proxy.h
 include/ppapi/cpp/output_traits.h
 include/ppapi/cpp/pass_ref.h
-include/ppapi/c/ppp_graphics_3d.h
-include/ppapi/c/ppp.h
-include/ppapi/c/ppp_input_event.h
-include/ppapi/c/ppp_instance.h
-include/ppapi/c/ppp_messaging.h
-include/ppapi/c/ppp_mouse_lock.h
-include/ppapi/c/pp_point.h
 include/ppapi/cpp/point.h
-include/ppapi/c/pp_rect.h
+include/ppapi/cpp/private/ext_crx_file_system_private.h
+include/ppapi/cpp/private/file_io_private.h
+include/ppapi/cpp/private/host_resolver_private.h
+include/ppapi/cpp/private/net_address_private.h
+include/ppapi/cpp/private/pass_file_handle.h
+include/ppapi/cpp/private/tcp_server_socket_private.h
+include/ppapi/cpp/private/tcp_socket_private.h
+include/ppapi/cpp/private/udp_socket_private.h
+include/ppapi/cpp/private/x509_certificate_private.h
 include/ppapi/cpp/rect.h
-include/ppapi/c/pp_resource.h
 include/ppapi/cpp/resource.h
-include/ppapi/c/pp_size.h
 include/ppapi/cpp/size.h
-include/ppapi/c/pp_stdint.h
 include/ppapi/cpp/tcp_socket.h
-include/ppapi/c/pp_time.h
-include/ppapi/c/pp_touch_point.h
 include/ppapi/cpp/touch_point.h
 include/ppapi/cpp/udp_socket.h
 include/ppapi/cpp/url_loader.h
 include/ppapi/cpp/url_request_info.h
 include/ppapi/cpp/url_response_info.h
-include/ppapi/cpp/var_array_buffer.h
+include/ppapi/cpp/var.h
 include/ppapi/cpp/var_array.h
+include/ppapi/cpp/var_array_buffer.h
 include/ppapi/cpp/var_dictionary.h
-include/ppapi/c/pp_var.h
-include/ppapi/cpp/var.h
 include/ppapi/cpp/view.h
 include/ppapi/cpp/websocket.h
 include/ppapi/gles2/gl2ext_ppapi.h
 include/ppapi/lib/gl/gles2/gl2ext_ppapi.h
-include/ppapi_simple/ps.h
-include/ppapi_simple/ps_context_2d.h
-include/ppapi_simple/ps_event.h
-include/ppapi_simple/ps_instance.h
-include/ppapi_simple/ps_interface.h
-include/ppapi_simple/ps_main.h
 include/ppapi/utility/completion_callback_factory.h
 include/ppapi/utility/completion_callback_factory_thread_traits.h
 include/ppapi/utility/graphics/paint_aggregator.h
@@ -512,6 +506,19 @@ include/ppapi/utility/graphics/paint_manager.h
 include/ppapi/utility/threading/lock.h
 include/ppapi/utility/threading/simple_thread.h
 include/ppapi/utility/websocket/websocket_api.h
+include/ppapi_simple/ps.h
+include/ppapi_simple/ps_context_2d.h
+include/ppapi_simple/ps_event.h
+include/ppapi_simple/ps_instance.h
+include/ppapi_simple/ps_interface.h
+include/ppapi_simple/ps_main.h
+include/sdk_util/atomicops.h
+include/sdk_util/auto_lock.h
+include/sdk_util/macros.h
+include/sdk_util/ref_object.h
+include/sdk_util/scoped_ref.h
+include/sdk_util/thread_pool.h
+include/sdk_util/thread_safe_queue.h
 [win]include/win/config.h
 [win]include/win/context.h
 [win]include/win/implement.h
@@ -519,13 +526,34 @@ include/ppapi/utility/websocket/websocket_api.h
 [win]include/win/pthread.h
 [win]include/win/sched.h
 [win]include/win/semaphore.h
-include/sdk_util/atomicops.h
-include/sdk_util/auto_lock.h
-include/sdk_util/macros.h
-include/sdk_util/ref_object.h
-include/sdk_util/scoped_ref.h
-include/sdk_util/thread_safe_queue.h
-include/sdk_util/thread_pool.h
+[linux]lib/${PLATFORM}_host/Debug/libjsoncpp.a
+[linux,mac]lib/${PLATFORM}_host/Debug/libppapi.a
+[linux]lib/${PLATFORM}_host/Debug/libppapi_cpp.a
+[linux]lib/${PLATFORM}_host/Debug/libppapi_cpp_private.a
+[linux]lib/${PLATFORM}_host/Debug/libppapi_gles2.a
+[linux]lib/${PLATFORM}_host/Release/libjsoncpp.a
+[linux,mac]lib/${PLATFORM}_host/Release/libppapi.a
+[linux]lib/${PLATFORM}_host/Release/libppapi_cpp.a
+[linux]lib/${PLATFORM}_host/Release/libppapi_cpp_private.a
+[linux]lib/${PLATFORM}_host/Release/libppapi_gles2.a
+[win]lib/${PLATFORM}_x86_32_host/Debug/jsoncpp.lib
+[win]lib/${PLATFORM}_x86_32_host/Debug/nacl_io.lib
+[win]lib/${PLATFORM}_x86_32_host/Debug/ppapi.lib
+[win]lib/${PLATFORM}_x86_32_host/Debug/ppapi_cpp.lib
+[win]lib/${PLATFORM}_x86_32_host/Debug/ppapi_cpp_private.lib
+[win]lib/${PLATFORM}_x86_32_host/Debug/ppapi_gles2.lib
+[win]lib/${PLATFORM}_x86_32_host/Debug/ppapi_simple.lib
+[win]lib/${PLATFORM}_x86_32_host/Debug/pthread.lib
+[win]lib/${PLATFORM}_x86_32_host/Debug/sdk_util.lib
+[win]lib/${PLATFORM}_x86_32_host/Release/jsoncpp.lib
+[win]lib/${PLATFORM}_x86_32_host/Release/nacl_io.lib
+[win]lib/${PLATFORM}_x86_32_host/Release/ppapi.lib
+[win]lib/${PLATFORM}_x86_32_host/Release/ppapi_cpp.lib
+[win]lib/${PLATFORM}_x86_32_host/Release/ppapi_cpp_private.lib
+[win]lib/${PLATFORM}_x86_32_host/Release/ppapi_gles2.lib
+[win]lib/${PLATFORM}_x86_32_host/Release/ppapi_simple.lib
+[win]lib/${PLATFORM}_x86_32_host/Release/pthread.lib
+[win]lib/${PLATFORM}_x86_32_host/Release/sdk_util.lib
 lib/glibc_x86_32/Debug/libjsoncpp.a
 lib/glibc_x86_32/Debug/libjsoncpp.so
 lib/glibc_x86_32/Debug/libnacl_io.a
@@ -582,34 +610,6 @@ lib/glibc_x86_64/Release/libppapi_simple.a
 lib/glibc_x86_64/Release/libppapi_simple.so
 lib/glibc_x86_64/Release/libsdk_util.a
 lib/glibc_x86_64/Release/libsdk_util.so
-[linux]lib/${PLATFORM}_host/Debug/libjsoncpp.a
-[linux,mac]lib/${PLATFORM}_host/Debug/libppapi.a
-[linux]lib/${PLATFORM}_host/Debug/libppapi_cpp.a
-[linux]lib/${PLATFORM}_host/Debug/libppapi_cpp_private.a
-[linux]lib/${PLATFORM}_host/Debug/libppapi_gles2.a
-[linux]lib/${PLATFORM}_host/Release/libjsoncpp.a
-[linux,mac]lib/${PLATFORM}_host/Release/libppapi.a
-[linux]lib/${PLATFORM}_host/Release/libppapi_cpp.a
-[linux]lib/${PLATFORM}_host/Release/libppapi_cpp_private.a
-[linux]lib/${PLATFORM}_host/Release/libppapi_gles2.a
-[win]lib/${PLATFORM}_x86_32_host/Debug/jsoncpp.lib
-[win]lib/${PLATFORM}_x86_32_host/Debug/nacl_io.lib
-[win]lib/${PLATFORM}_x86_32_host/Debug/ppapi_cpp.lib
-[win]lib/${PLATFORM}_x86_32_host/Debug/ppapi_cpp_private.lib
-[win]lib/${PLATFORM}_x86_32_host/Debug/ppapi_gles2.lib
-[win]lib/${PLATFORM}_x86_32_host/Debug/ppapi.lib
-[win]lib/${PLATFORM}_x86_32_host/Debug/ppapi_simple.lib
-[win]lib/${PLATFORM}_x86_32_host/Debug/pthread.lib
-[win]lib/${PLATFORM}_x86_32_host/Release/jsoncpp.lib
-[win]lib/${PLATFORM}_x86_32_host/Release/nacl_io.lib
-[win]lib/${PLATFORM}_x86_32_host/Release/ppapi_cpp.lib
-[win]lib/${PLATFORM}_x86_32_host/Release/ppapi_cpp_private.lib
-[win]lib/${PLATFORM}_x86_32_host/Release/ppapi_gles2.lib
-[win]lib/${PLATFORM}_x86_32_host/Release/ppapi.lib
-[win]lib/${PLATFORM}_x86_32_host/Release/ppapi_simple.lib
-[win]lib/${PLATFORM}_x86_32_host/Release/pthread.lib
-[win]lib/${PLATFORM}_x86_32_host/Debug/sdk_util.lib
-[win]lib/${PLATFORM}_x86_32_host/Release/sdk_util.lib
 lib/newlib_arm/Debug/liberror_handling.a
 lib/newlib_arm/Debug/libjsoncpp.a
 lib/newlib_arm/Debug/libnacl_io.a
@@ -718,6 +718,9 @@ src/nacl_io/nacl_io.cc
 src/nacl_io/path.cc
 src/nacl_io/pepper_interface.cc
 src/nacl_io/real_pepper_interface.cc
+[win]src/ppapi/make.bat
+src/ppapi/Makefile
+src/ppapi/ppapi_externs.c
 src/ppapi_cpp/alarms_dev.cc
 src/ppapi_cpp/array_output.cc
 src/ppapi_cpp/audio.cc
@@ -749,6 +752,7 @@ src/ppapi_cpp/input_event.cc
 src/ppapi_cpp/instance.cc
 src/ppapi_cpp/instance_handle.cc
 src/ppapi_cpp/lock.cc
+[win]src/ppapi_cpp/make.bat
 src/ppapi_cpp/Makefile
 src/ppapi_cpp/memory_dev.cc
 src/ppapi_cpp/message_loop.cc
@@ -762,8 +766,8 @@ src/ppapi_cpp/paint_manager.cc
 src/ppapi_cpp/ppp_entrypoints.cc
 src/ppapi_cpp/printing_dev.cc
 src/ppapi_cpp/rect.cc
-src/ppapi_cpp/resource_array_dev.cc
 src/ppapi_cpp/resource.cc
+src/ppapi_cpp/resource_array_dev.cc
 src/ppapi_cpp/scriptable_object_deprecated.cc
 src/ppapi_cpp/scrollbar_dev.cc
 src/ppapi_cpp/selection_dev.cc
@@ -777,9 +781,9 @@ src/ppapi_cpp/url_loader.cc
 src/ppapi_cpp/url_request_info.cc
 src/ppapi_cpp/url_response_info.cc
 src/ppapi_cpp/url_util_dev.cc
-src/ppapi_cpp/var_array_buffer.cc
-src/ppapi_cpp/var_array.cc
 src/ppapi_cpp/var.cc
+src/ppapi_cpp/var_array.cc
+src/ppapi_cpp/var_array_buffer.cc
 src/ppapi_cpp/var_dictionary.cc
 src/ppapi_cpp/video_capture_client_dev.cc
 src/ppapi_cpp/video_capture_dev.cc
@@ -787,12 +791,22 @@ src/ppapi_cpp/video_decoder_client_dev.cc
 src/ppapi_cpp/video_decoder_dev.cc
 src/ppapi_cpp/view.cc
 src/ppapi_cpp/view_dev.cc
-src/ppapi_cpp/websocket_api.cc
 src/ppapi_cpp/websocket.cc
+src/ppapi_cpp/websocket_api.cc
 src/ppapi_cpp/widget_client_dev.cc
 src/ppapi_cpp/widget_dev.cc
 src/ppapi_cpp/zoom_dev.cc
-[win]src/ppapi_cpp/make.bat
+src/ppapi_cpp_private/ext_crx_file_system_private.cc
+src/ppapi_cpp_private/file_io_private.cc
+src/ppapi_cpp_private/host_resolver_private.cc
+[win]src/ppapi_cpp_private/make.bat
+src/ppapi_cpp_private/Makefile
+src/ppapi_cpp_private/net_address_private.cc
+src/ppapi_cpp_private/pass_file_handle.cc
+src/ppapi_cpp_private/tcp_server_socket_private.cc
+src/ppapi_cpp_private/tcp_socket_private.cc
+src/ppapi_cpp_private/udp_socket_private.cc
+src/ppapi_cpp_private/x509_certificate_private.cc
 src/ppapi_gles2/gl2ext_ppapi.c
 src/ppapi_gles2/gles2.c
 [win]src/ppapi_gles2/make.bat
@@ -805,17 +819,6 @@ src/ppapi_simple/ps_event.cc
 src/ppapi_simple/ps_instance.cc
 src/ppapi_simple/ps_interface.cc
 src/ppapi_simple/ps_main.cc
-src/ppapi_cpp_private/Makefile
-[win]src/ppapi_cpp_private/make.bat
-src/ppapi_cpp_private/file_io_private.cc
-src/ppapi_cpp_private/net_address_private.cc
-src/ppapi_cpp_private/pass_file_handle.cc
-src/ppapi_cpp_private/tcp_socket_private.cc
-src/ppapi_cpp_private/udp_socket_private.cc
-src/ppapi_cpp_private/ext_crx_file_system_private.cc
-src/ppapi_cpp_private/host_resolver_private.cc
-src/ppapi_cpp_private/tcp_server_socket_private.cc
-src/ppapi_cpp_private/x509_certificate_private.cc
 [win]src/pthread/autostatic.c
 [win]src/pthread/cleanup.c
 [win]src/pthread/CONTRIBUTORS
@@ -960,12 +963,10 @@ src/ppapi_cpp_private/x509_certificate_private.cc
 [win]src/pthread/sem_wait.c
 [win]src/pthread/signal.c
 [win]src/pthread/w32_CancelableWait.c
-[win]src/ppapi/make.bat
-src/ppapi/Makefile
-src/ppapi/ppapi_externs.c
-src/sdk_util/Makefile
 [win]src/sdk_util/make.bat
+src/sdk_util/Makefile
 src/sdk_util/thread_pool.cc
+toolchain/${PLATFORM}_arm_newlib/*
 toolchain/${PLATFORM}_arm_newlib/arm-nacl/include/irt.h
 toolchain/${PLATFORM}_arm_newlib/arm-nacl/include/irt_ppapi.h
 toolchain/${PLATFORM}_arm_newlib/arm-nacl/include/nacl/dynamic_annotations.h
@@ -988,7 +989,7 @@ toolchain/${PLATFORM}_arm_newlib/arm-nacl/lib/libnosys.a
 toolchain/${PLATFORM}_arm_newlib/arm-nacl/lib/libppapi.a
 toolchain/${PLATFORM}_arm_newlib/arm-nacl/lib/libppapi_stub.a
 toolchain/${PLATFORM}_arm_newlib/arm-nacl/lib/libpthread.a
-toolchain/${PLATFORM}_arm_newlib/*
+toolchain/${PLATFORM}_x86_glibc/*
 toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/include/irt.h
 toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/include/irt_ppapi.h
 toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/include/nacl/dynamic_annotations.h
@@ -998,18 +999,6 @@ toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/include/nacl/nacl_minidump.h
 toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/include/nacl/nacl_startup.h
 toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/include/nacl/nacl_thread.h
 toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/include/pnacl.h
-toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libminidump_generator.a
-toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libminidump_generator.so
-toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libnacl.a
-toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libnacl_dyncode.a
-toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libnacl_dyncode.so
-toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libnacl_exception.a
-toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libnacl_exception.so
-toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libnacl_list_mappings.a
-toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libnacl_list_mappings.so
-toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libppapi.a
-toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libppapi.so
-toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libppapi_stub.a
 toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib/libminidump_generator.a
 toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib/libminidump_generator.so
 toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib/libnacl.a
@@ -1022,7 +1011,19 @@ toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib/libnacl_list_mappings.so
 toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib/libppapi.a
 toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib/libppapi.so
 toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib/libppapi_stub.a
-toolchain/${PLATFORM}_x86_glibc/*
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libminidump_generator.a
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libminidump_generator.so
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libnacl.a
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libnacl_dyncode.a
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libnacl_dyncode.so
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libnacl_exception.a
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libnacl_exception.so
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libnacl_list_mappings.a
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libnacl_list_mappings.so
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libppapi.a
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libppapi.so
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libppapi_stub.a
+toolchain/${PLATFORM}_x86_newlib/*
 toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/include/irt.h
 toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/include/irt_ppapi.h
 toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/include/nacl/dynamic_annotations.h
@@ -1034,17 +1035,6 @@ toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/include/nacl/nacl_thread.h
 toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/include/pnacl.h
 toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/include/pthread.h
 toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/include/semaphore.h
-toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/crti.o
-toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/crtn.o
-toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libminidump_generator.a
-toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libnacl.a
-toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libnacl_dyncode.a
-toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libnacl_exception.a
-toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libnacl_list_mappings.a
-toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libnosys.a
-toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libppapi.a
-toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libppapi_stub.a
-toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libpthread.a
 toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib/crti.o
 toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib/crtn.o
 toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib/libminidump_generator.a
@@ -1056,7 +1046,18 @@ toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib/libnosys.a
 toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib/libppapi.a
 toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib/libppapi_stub.a
 toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib/libpthread.a
-toolchain/${PLATFORM}_x86_newlib/*
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/crti.o
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/crtn.o
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libminidump_generator.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libnacl.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libnacl_dyncode.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libnacl_exception.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libnacl_list_mappings.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libnosys.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libppapi.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libppapi_stub.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libpthread.a
+toolchain/${PLATFORM}_x86_pnacl/*
 toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/include/irt.h
 toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/include/irt_ppapi.h
 toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/include/nacl/dynamic_annotations.h
@@ -1068,7 +1069,6 @@ toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/include/nacl/nacl_thread.h
 toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/include/pnacl.h
 toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/include/pthread.h
 toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/include/semaphore.h
-toolchain/${PLATFORM}_x86_pnacl/*
 tools/common.mk
 tools/compiler-wrapper.py
 tools/create_html.py
@@ -1076,8 +1076,6 @@ tools/create_nmf.py
 tools/decode_dump.py
 [linux,mac]tools/dump_syms
 tools/fix_deps.py
-[linux,mac]tools/minidump_stackwalk
-[linux,mac]tools/minidump_dump
 tools/genhttpfs.py
 tools/getos.py
 tools/host_gcc.mk
@@ -1086,6 +1084,8 @@ tools/httpd.py
 tools/irt_core_x86_32.nexe
 tools/irt_core_x86_64.nexe
 [win]tools/make.exe
+[linux,mac]tools/minidump_dump
+[linux,mac]tools/minidump_stackwalk
 tools/nacl_gcc.mk
 [linux]tools/nacl_helper_bootstrap_x86_32
 [linux]tools/nacl_helper_bootstrap_x86_64
diff --git a/native_client_sdk/src/build_tools/verify_filelist.py b/native_client_sdk/src/build_tools/verify_filelist.py
index f43e99f..95526bf 100755
--- a/native_client_sdk/src/build_tools/verify_filelist.py
+++ b/native_client_sdk/src/build_tools/verify_filelist.py
@@ -16,6 +16,7 @@ sys.path.append(os.path.join(SDK_SRC_DIR, 'tools'))
 import getos
 
 VALID_PLATFORMS = ['linux', 'mac', 'win']
+PLATFORM_PREFIX_RE = re.compile(r'^\[([^\]]*)\](.*)$')
 
 class ParseException(Exception):
   def __init__(self, filename, line, message):
@@ -28,6 +29,19 @@ class ParseException(Exception):
     return '%s:%d: %s' % (self.filename, self.line, self.message)
 
 
+def SplitPattern(pattern):
+  match = PLATFORM_PREFIX_RE.match(pattern)
+  if not match:
+    return pattern, []
+
+  # platform-specific line
+  platforms = match.group(1).split(',')
+
+  # If this platform is included, strip the [...] part.
+  pattern = match.group(2)
+  return pattern, platforms
+
+
 class VerifyException(Exception):
   pass
 
@@ -53,10 +67,8 @@ class Rules(object):
         self.ParsePattern(line_no + 1, rule)
 
   def ParsePattern(self, line_no, pattern):
-    match = re.match(r'^\[([^\]]*)\](.*)$', pattern)
-    if match:
-      # platform-specific pattern
-      platforms = match.group(1).split(',')
+    pattern, platforms = SplitPattern(pattern)
+    if platforms:
       unknown_platforms = set(platforms) - set(VALID_PLATFORMS)
       if unknown_platforms:
         msg = 'Unknown platform(s) %s.' % (
@@ -65,9 +77,6 @@ class Rules(object):
       if self.platform not in platforms:
         return
 
-      # If this platform is included, strip the [...] part.
-      pattern = match.group(2)
-
     pattern = pattern.replace('${PLATFORM}', self.platform)
     pattern = pattern.replace('${EXE_EXT}', self.exe_ext)
 
@@ -148,11 +157,35 @@ def Verify(rule_path, directory_path, platform=None):
   rules.VerifyDirectoryList(directory_list)
 
 
+def SortFile(rule_path):
+  with open(rule_path) as infile:
+    lines = infile.readlines()
+
+  def compare(line1, line2):
+    line1 = SplitPattern(line1)[0].lower()
+    line2 = SplitPattern(line2)[0].lower()
+    return cmp(line1, line2)
+
+  lines.sort(compare)
+  with open(rule_path, 'w') as output:
+    for line in lines:
+      output.write(line)
+
+
 def main(args):
   parser = optparse.OptionParser(usage='%prog <rule file> <directory>')
   parser.add_option('-p', '--platform',
       help='Test with this platform, instead of the system\'s platform')
+  parser.add_option('-s', '--sort', action='store_true',
+      help='Sort the file list in place, rather than verifying the contents.')
   options, args = parser.parse_args(args)
+
+  if options.sort:
+    if not args:
+      parser.error('Expected rule file.')
+    SortFile(args[0])
+    return 0
+
   if len(args) != 2:
     parser.error('Expected rule file and directory.')