diff options
author | satorux <satorux@chromium.org> | 2015-02-15 23:09:40 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-02-16 07:10:22 +0000 |
commit | c96d5d2b62b03bae7a3812b441d1470755f7a376 (patch) | |
tree | 8a96412357bec7b474d56913ef9ade281474ecf0 /ppapi | |
parent | 7b54be1752c3c06f1e2b5c0335f4e0b700609963 (diff) | |
download | chromium_src-c96d5d2b62b03bae7a3812b441d1470755f7a376.zip chromium_src-c96d5d2b62b03bae7a3812b441d1470755f7a376.tar.gz chromium_src-c96d5d2b62b03bae7a3812b441d1470755f7a376.tar.bz2 |
Sort GYP and GN files under ppapi
For tools/sort_sources.py to be useful, existing GYP and GN files
should be sorted.
BUG=456014
TEST=everything should build as before
Review URL: https://codereview.chromium.org/930753002
Cr-Commit-Position: refs/heads/master@{#316434}
Diffstat (limited to 'ppapi')
-rw-r--r-- | ppapi/examples/video_decode/BUILD.gn | 4 | ||||
-rw-r--r-- | ppapi/native_client/src/untrusted/irt_stub/irt_stub.gyp | 2 | ||||
-rw-r--r-- | ppapi/ppapi_proxy.gypi | 2 | ||||
-rw-r--r-- | ppapi/ppapi_shared.gypi | 37 | ||||
-rw-r--r-- | ppapi/ppapi_sources.gypi | 6 | ||||
-rw-r--r-- | ppapi/ppapi_tests.gypi | 4 | ||||
-rw-r--r-- | ppapi/proxy/BUILD.gn | 10 | ||||
-rw-r--r-- | ppapi/shared_impl/BUILD.gn | 14 | ||||
-rw-r--r-- | ppapi/tests/extensions/extensions.gyp | 2 | ||||
-rw-r--r-- | ppapi/thunk/BUILD.gn | 16 |
10 files changed, 49 insertions, 48 deletions
diff --git a/ppapi/examples/video_decode/BUILD.gn b/ppapi/examples/video_decode/BUILD.gn index 285136e..dfbc28e 100644 --- a/ppapi/examples/video_decode/BUILD.gn +++ b/ppapi/examples/video_decode/BUILD.gn @@ -15,8 +15,8 @@ group("video_decode") { ppapi_example("dev") { output_name = "ppapi_example_video_decode_dev" sources = [ - "video_decode_dev.cc", "testdata.h", + "video_decode_dev.cc", ] deps = [ "//ppapi/cpp", @@ -27,8 +27,8 @@ ppapi_example("dev") { ppapi_example("stable") { output_name = "ppapi_example_video_decode" sources = [ - "video_decode.cc", "testdata.h", + "video_decode.cc", ] deps = [ "//ppapi/cpp", diff --git a/ppapi/native_client/src/untrusted/irt_stub/irt_stub.gyp b/ppapi/native_client/src/untrusted/irt_stub/irt_stub.gyp index 2259578..db1493d 100644 --- a/ppapi/native_client/src/untrusted/irt_stub/irt_stub.gyp +++ b/ppapi/native_client/src/untrusted/irt_stub/irt_stub.gyp @@ -20,9 +20,9 @@ '../../../..', ], 'sources': [ + 'plugin_main_irt.c', 'ppapi_plugin_main.c', 'ppapi_plugin_start.c', - 'plugin_main_irt.c', 'thread_creator.c' ], 'dependencies': [ diff --git a/ppapi/ppapi_proxy.gypi b/ppapi/ppapi_proxy.gypi index 97b7a09..312b649 100644 --- a/ppapi/ppapi_proxy.gypi +++ b/ppapi/ppapi_proxy.gypi @@ -130,8 +130,8 @@ 'proxy/plugin_var_tracker.h', 'proxy/ppapi_command_buffer_proxy.cc', 'proxy/ppapi_command_buffer_proxy.h', - 'proxy/ppapi_messages.h', 'proxy/ppapi_message_utils.h', + 'proxy/ppapi_messages.h', 'proxy/ppb_audio_proxy.cc', 'proxy/ppb_audio_proxy.h', 'proxy/ppb_broker_proxy.cc', diff --git a/ppapi/ppapi_shared.gypi b/ppapi/ppapi_shared.gypi index 43d8895..07a2886 100644 --- a/ppapi/ppapi_shared.gypi +++ b/ppapi/ppapi_shared.gypi @@ -22,10 +22,10 @@ 'shared_impl/compositor_layer_data.h', 'shared_impl/dictionary_var.cc', 'shared_impl/dictionary_var.h', - 'shared_impl/file_io_state_manager.cc', - 'shared_impl/file_io_state_manager.h', 'shared_impl/file_growth.cc', 'shared_impl/file_growth.h', + 'shared_impl/file_io_state_manager.cc', + 'shared_impl/file_io_state_manager.h', 'shared_impl/file_path.cc', 'shared_impl/file_path.h', 'shared_impl/file_ref_create_info.cc', @@ -42,11 +42,11 @@ 'shared_impl/host_resource.h', 'shared_impl/id_assignment.cc', 'shared_impl/id_assignment.h', + 'shared_impl/media_stream_audio_track_shared.cc', + 'shared_impl/media_stream_audio_track_shared.h', 'shared_impl/media_stream_buffer.h', 'shared_impl/media_stream_buffer_manager.cc', 'shared_impl/media_stream_buffer_manager.h', - 'shared_impl/media_stream_audio_track_shared.cc', - 'shared_impl/media_stream_audio_track_shared.h', 'shared_impl/media_stream_video_track_shared.cc', 'shared_impl/media_stream_video_track_shared.h', 'shared_impl/platform_file.cc', @@ -99,6 +99,11 @@ 'shared_impl/ppp_flash_browser_operations_shared.h', 'shared_impl/ppp_instance_combined.cc', 'shared_impl/ppp_instance_combined.h', + # TODO(viettrungluu): Split these out; it won't be used in NaCl. + 'shared_impl/private/net_address_private_impl.cc', + 'shared_impl/private/net_address_private_impl.h', + 'shared_impl/private/net_address_private_impl_constants.cc', + 'shared_impl/proxy_lock.cc', 'shared_impl/proxy_lock.h', 'shared_impl/resource.cc', @@ -129,10 +134,6 @@ 'shared_impl/var.h', 'shared_impl/var_tracker.cc', 'shared_impl/var_tracker.h', - # TODO(viettrungluu): Split these out; it won't be used in NaCl. - 'shared_impl/private/net_address_private_impl.cc', - 'shared_impl/private/net_address_private_impl_constants.cc', - 'shared_impl/private/net_address_private_impl.h', 'shared_impl/private/ppb_char_set_shared.cc', 'shared_impl/private/ppb_char_set_shared.h', @@ -142,10 +143,10 @@ 'thunk/enter.cc', 'thunk/enter.h', 'thunk/ppb_audio_api.h', - 'thunk/ppb_audio_config_api.h', - 'thunk/ppb_audio_config_thunk.cc', 'thunk/ppb_audio_buffer_api.h', 'thunk/ppb_audio_buffer_thunk.cc', + 'thunk/ppb_audio_config_api.h', + 'thunk/ppb_audio_config_thunk.cc', 'thunk/ppb_audio_input_api.h', 'thunk/ppb_audio_input_dev_thunk.cc', 'thunk/ppb_audio_thunk.cc', @@ -205,14 +206,14 @@ 'thunk/ppb_graphics_3d_api.h', 'thunk/ppb_graphics_3d_thunk.cc', 'thunk/ppb_host_resolver_api.h', - 'thunk/ppb_host_resolver_thunk.cc', 'thunk/ppb_host_resolver_private_api.h', 'thunk/ppb_host_resolver_private_thunk.cc', + 'thunk/ppb_host_resolver_thunk.cc', 'thunk/ppb_image_data_api.h', 'thunk/ppb_image_data_thunk.cc', 'thunk/ppb_input_event_api.h', - 'thunk/ppb_input_event_thunk.cc', 'thunk/ppb_input_event_private_thunk.cc', + 'thunk/ppb_input_event_thunk.cc', 'thunk/ppb_instance_api.h', 'thunk/ppb_instance_private_thunk.cc', 'thunk/ppb_instance_thunk.cc', @@ -254,12 +255,12 @@ 'thunk/ppb_tcp_socket_thunk.cc', 'thunk/ppb_text_input_thunk.cc', 'thunk/ppb_truetype_font_api.h', - 'thunk/ppb_truetype_font_singleton_api.h', 'thunk/ppb_truetype_font_dev_thunk.cc', + 'thunk/ppb_truetype_font_singleton_api.h', 'thunk/ppb_udp_socket_api.h', - 'thunk/ppb_udp_socket_thunk.cc', 'thunk/ppb_udp_socket_private_api.h', 'thunk/ppb_udp_socket_private_thunk.cc', + 'thunk/ppb_udp_socket_thunk.cc', 'thunk/ppb_uma_private_thunk.cc', 'thunk/ppb_uma_singleton_api.h', 'thunk/ppb_url_loader_api.h', @@ -310,16 +311,16 @@ 'sources!': [ 'shared_impl/flash_clipboard_format_registry.cc', 'shared_impl/ppb_url_util_shared.cc', - 'shared_impl/ppb_video_decoder_shared.cc', 'shared_impl/ppb_video_capture_shared.cc', + 'shared_impl/ppb_video_decoder_shared.cc', 'shared_impl/private/ppb_browser_font_trusted_shared.cc', 'shared_impl/private/ppb_char_set_shared.cc', 'thunk/ppb_audio_input_dev_thunk.cc', 'thunk/ppb_broker_thunk.cc', 'thunk/ppb_browser_font_trusted_thunk.cc', 'thunk/ppb_buffer_thunk.cc', - 'thunk/ppb_content_decryptor_private_thunk.cc', 'thunk/ppb_char_set_thunk.cc', + 'thunk/ppb_content_decryptor_private_thunk.cc', 'thunk/ppb_flash_clipboard_thunk.cc', 'thunk/ppb_flash_device_id_thunk.cc', 'thunk/ppb_flash_drm_thunk.cc', @@ -329,8 +330,8 @@ 'thunk/ppb_flash_fullscreen_thunk.cc', 'thunk/ppb_flash_menu_thunk.cc', 'thunk/ppb_flash_message_loop_thunk.cc', - 'thunk/ppb_flash_thunk.cc', 'thunk/ppb_flash_message_loop_thunk.cc', + 'thunk/ppb_flash_thunk.cc', 'thunk/ppb_gles_chromium_texture_mapping_thunk.cc', 'thunk/ppb_pdf_thunk.cc', 'thunk/ppb_platform_verification_private_thunk.cc', @@ -349,8 +350,8 @@ 'shared_impl/ppb_audio_shared.cc', 'shared_impl/ppb_graphics_3d_shared.cc', 'shared_impl/ppb_opengles2_shared.cc', - 'shared_impl/private/ppb_host_resolver_shared.cc', 'shared_impl/private/net_address_private_impl.cc', + 'shared_impl/private/ppb_host_resolver_shared.cc', 'thunk/ppb_graphics_3d_thunk.cc', 'thunk/ppb_host_resolver_private_thunk.cc', 'thunk/ppb_tcp_server_socket_private_thunk.cc', diff --git a/ppapi/ppapi_sources.gypi b/ppapi/ppapi_sources.gypi index ffd2e45..5560ab9 100644 --- a/ppapi/ppapi_sources.gypi +++ b/ppapi/ppapi_sources.gypi @@ -125,9 +125,9 @@ 'c/private/ppb_pdf.h', 'c/private/ppb_platform_verification_private.h', 'c/private/ppb_proxy_private.h', - 'c/private/ppb_testing_private.h', 'c/private/ppb_tcp_server_socket_private.h', 'c/private/ppb_tcp_socket_private.h', + 'c/private/ppb_testing_private.h', 'c/private/ppb_udp_socket_private.h', 'c/private/ppb_uma_private.h', 'c/private/ppb_video_destination_private.h', @@ -302,8 +302,8 @@ 'cpp/dev/zoom_dev.h', # Deprecated interfaces. - 'cpp/dev/scriptable_object_deprecated.h', 'cpp/dev/scriptable_object_deprecated.cc', + 'cpp/dev/scriptable_object_deprecated.h', # Private interfaces. 'cpp/private/content_decryptor_private.cc', @@ -394,9 +394,9 @@ # 'test_common_source_files': [ # Common test files - 'lib/gl/gles2/gles2.c', 'lib/gl/gles2/gl2ext_ppapi.c', 'lib/gl/gles2/gl2ext_ppapi.h', + 'lib/gl/gles2/gles2.c', 'tests/all_c_includes.h', 'tests/all_cpp_includes.h', 'tests/arch_dependent_sizes_32.h', diff --git a/ppapi/ppapi_tests.gypi b/ppapi/ppapi_tests.gypi index 9b3067b..0e5de16 100644 --- a/ppapi/ppapi_tests.gypi +++ b/ppapi/ppapi_tests.gypi @@ -476,8 +476,8 @@ 'lib/gl/include', ], 'sources': [ - 'examples/video_decode/video_decode.cc', 'examples/video_decode/testdata.h', + 'examples/video_decode/video_decode.cc', ], }, { @@ -492,8 +492,8 @@ 'lib/gl/include', ], 'sources': [ - 'examples/video_decode/video_decode_dev.cc', 'examples/video_decode/testdata.h', + 'examples/video_decode/video_decode_dev.cc', ], }, { diff --git a/ppapi/proxy/BUILD.gn b/ppapi/proxy/BUILD.gn index 4e638cc..adda193 100644 --- a/ppapi/proxy/BUILD.gn +++ b/ppapi/proxy/BUILD.gn @@ -98,8 +98,8 @@ component("proxy") { "plugin_var_tracker.h", "ppapi_command_buffer_proxy.cc", "ppapi_command_buffer_proxy.h", - "ppapi_messages.h", "ppapi_message_utils.h", + "ppapi_messages.h", "ppb_audio_proxy.cc", "ppb_audio_proxy.h", "ppb_core_proxy.cc", @@ -250,14 +250,14 @@ component("proxy") { "ppp_instance_private_proxy.h", "ppp_video_decoder_proxy.cc", "ppp_video_decoder_proxy.h", - "video_decoder_resource.cc", - "video_decoder_resource.h", - "video_encoder_resource.cc", - "video_encoder_resource.h", "talk_resource.cc", "talk_resource.h", "video_capture_resource.cc", "video_capture_resource.h", + "video_decoder_resource.cc", + "video_decoder_resource.h", + "video_encoder_resource.cc", + "video_encoder_resource.h", ] } diff --git a/ppapi/shared_impl/BUILD.gn b/ppapi/shared_impl/BUILD.gn index b86553f..8595ae39 100644 --- a/ppapi/shared_impl/BUILD.gn +++ b/ppapi/shared_impl/BUILD.gn @@ -16,10 +16,10 @@ component("shared_impl") { "compositor_layer_data.h", "dictionary_var.cc", "dictionary_var.h", - "file_io_state_manager.cc", - "file_io_state_manager.h", "file_growth.cc", "file_growth.h", + "file_io_state_manager.cc", + "file_io_state_manager.h", "file_path.cc", "file_path.h", "file_ref_create_info.cc", @@ -34,13 +34,13 @@ component("shared_impl") { "host_resource.h", "id_assignment.cc", "id_assignment.h", + "media_stream_audio_track_shared.cc", + "media_stream_audio_track_shared.h", "media_stream_buffer.h", "media_stream_buffer_manager.cc", "media_stream_buffer_manager.h", - "media_stream_audio_track_shared.cc", - "media_stream_audio_track_shared.h", - "media_stream_video_track_shared.h", "media_stream_video_track_shared.cc", + "media_stream_video_track_shared.h", "platform_file.cc", "platform_file.h", "ppapi_constants.h", @@ -120,8 +120,8 @@ component("shared_impl") { # TODO(viettrungluu): Split these out; it won"t be used in NaCl. "private/net_address_private_impl.cc", - "private/net_address_private_impl_constants.cc", "private/net_address_private_impl.h", + "private/net_address_private_impl_constants.cc", "private/ppb_x509_certificate_private_shared.cc", "private/ppb_x509_certificate_private_shared.h", ] @@ -148,8 +148,8 @@ component("shared_impl") { "ppb_audio_shared.cc", "ppb_graphics_3d_shared.cc", "ppb_opengles2_shared.cc", - "private/ppb_host_resolver_shared.cc", "private/net_address_private_impl.cc", + "private/ppb_host_resolver_shared.cc", ] } diff --git a/ppapi/tests/extensions/extensions.gyp b/ppapi/tests/extensions/extensions.gyp index ff5ba97a..62579bc 100644 --- a/ppapi/tests/extensions/extensions.gyp +++ b/ppapi/tests/extensions/extensions.gyp @@ -37,9 +37,9 @@ 'build_pnacl_newlib': 0, 'nexe_destination_dir': 'test_data/ppapi/tests/extensions/media_galleries', 'sources': [ - 'media_galleries/test_galleries.cc', '<(DEPTH)/ppapi/tests/test_utils.cc', '<(DEPTH)/ppapi/tests/test_utils.h', + 'media_galleries/test_galleries.cc', ], 'test_files': [ 'media_galleries/background.js', diff --git a/ppapi/thunk/BUILD.gn b/ppapi/thunk/BUILD.gn index e507816..8e66d92 100644 --- a/ppapi/thunk/BUILD.gn +++ b/ppapi/thunk/BUILD.gn @@ -7,10 +7,10 @@ source_set("thunk") { "enter.cc", "enter.h", "ppb_audio_api.h", - "ppb_audio_config_api.h", - "ppb_audio_config_thunk.cc", "ppb_audio_buffer_api.h", "ppb_audio_buffer_thunk.cc", + "ppb_audio_config_api.h", + "ppb_audio_config_thunk.cc", "ppb_audio_input_api.h", "ppb_audio_thunk.cc", "ppb_broker_api.h", @@ -53,14 +53,14 @@ source_set("thunk") { "ppb_graphics_3d_api.h", "ppb_graphics_3d_thunk.cc", "ppb_host_resolver_api.h", - "ppb_host_resolver_thunk.cc", "ppb_host_resolver_private_api.h", "ppb_host_resolver_private_thunk.cc", + "ppb_host_resolver_thunk.cc", "ppb_image_data_api.h", "ppb_image_data_thunk.cc", "ppb_input_event_api.h", - "ppb_input_event_thunk.cc", "ppb_input_event_private_thunk.cc", + "ppb_input_event_thunk.cc", "ppb_instance_api.h", "ppb_instance_private_thunk.cc", "ppb_instance_thunk.cc", @@ -98,12 +98,12 @@ source_set("thunk") { "ppb_tcp_socket_thunk.cc", "ppb_text_input_thunk.cc", "ppb_truetype_font_api.h", - "ppb_truetype_font_singleton_api.h", "ppb_truetype_font_dev_thunk.cc", + "ppb_truetype_font_singleton_api.h", "ppb_udp_socket_api.h", - "ppb_udp_socket_thunk.cc", "ppb_udp_socket_private_api.h", "ppb_udp_socket_private_thunk.cc", + "ppb_udp_socket_thunk.cc", "ppb_uma_private_thunk.cc", "ppb_uma_singleton_api.h", "ppb_url_loader_api.h", @@ -147,8 +147,8 @@ source_set("thunk") { "ppb_broker_thunk.cc", "ppb_browser_font_trusted_thunk.cc", "ppb_buffer_thunk.cc", - "ppb_content_decryptor_private_thunk.cc", "ppb_char_set_thunk.cc", + "ppb_content_decryptor_private_thunk.cc", "ppb_flash_clipboard_thunk.cc", "ppb_flash_device_id_thunk.cc", "ppb_flash_drm_thunk.cc", @@ -157,8 +157,8 @@ source_set("thunk") { "ppb_flash_font_file_thunk.cc", "ppb_flash_fullscreen_thunk.cc", "ppb_flash_menu_thunk.cc", - "ppb_flash_thunk.cc", "ppb_flash_message_loop_thunk.cc", + "ppb_flash_thunk.cc", "ppb_gles_chromium_texture_mapping_thunk.cc", "ppb_pdf_thunk.cc", "ppb_platform_verification_private_thunk.cc", |