summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsatorux <satorux@chromium.org>2015-02-17 17:52:30 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-18 01:53:07 +0000
commit36aa312fc5fd224bc1967ee5186eca635a0babcb (patch)
tree47fa51d6a2896456a77eb0f2e4647f7fcffeabf5
parente66ce87932cfe85a770e11086b3f2054ab42839e (diff)
downloadchromium_src-36aa312fc5fd224bc1967ee5186eca635a0babcb.zip
chromium_src-36aa312fc5fd224bc1967ee5186eca635a0babcb.tar.gz
chromium_src-36aa312fc5fd224bc1967ee5186eca635a0babcb.tar.bz2
Sort GYP and GN files under remoting
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/934703002 Cr-Commit-Position: refs/heads/master@{#316733}
-rw-r--r--remoting/remoting_host.gypi4
-rw-r--r--remoting/remoting_host_mac.gypi2
-rw-r--r--remoting/remoting_host_srcs.gypi4
-rw-r--r--remoting/remoting_nacl.gyp2
4 files changed, 6 insertions, 6 deletions
diff --git a/remoting/remoting_host.gypi b/remoting/remoting_host.gypi
index 733f17f..6a5e95c 100644
--- a/remoting/remoting_host.gypi
+++ b/remoting/remoting_host.gypi
@@ -219,14 +219,14 @@
'../base/base.gyp:base',
],
'sources': [
- 'host/native_messaging/pipe_messaging_channel.cc',
- 'host/native_messaging/pipe_messaging_channel.h',
'host/native_messaging/native_messaging_pipe.cc',
'host/native_messaging/native_messaging_pipe.h',
'host/native_messaging/native_messaging_reader.cc',
'host/native_messaging/native_messaging_reader.h',
'host/native_messaging/native_messaging_writer.cc',
'host/native_messaging/native_messaging_writer.h',
+ 'host/native_messaging/pipe_messaging_channel.cc',
+ 'host/native_messaging/pipe_messaging_channel.h',
],
}, # end of target 'remoting_native_messaging_base'
diff --git a/remoting/remoting_host_mac.gypi b/remoting/remoting_host_mac.gypi
index 848b8f6..6e68e73 100644
--- a/remoting/remoting_host_mac.gypi
+++ b/remoting/remoting_host_mac.gypi
@@ -199,8 +199,8 @@
# TODO(lambroslambrou): Fix this when Chrome supports building for
# Mac OS X 64-bit - http://crbug.com/128122.
'sources': [
- '../third_party/jsoncpp/source/src/lib_json/json_reader.cpp',
'../third_party/jsoncpp/overrides/src/lib_json/json_value.cpp',
+ '../third_party/jsoncpp/source/src/lib_json/json_reader.cpp',
'../third_party/jsoncpp/source/src/lib_json/json_writer.cpp',
'../third_party/modp_b64/modp_b64.cc',
'host/constants_mac.cc',
diff --git a/remoting/remoting_host_srcs.gypi b/remoting/remoting_host_srcs.gypi
index 8818ac8..fbdfc71 100644
--- a/remoting/remoting_host_srcs.gypi
+++ b/remoting/remoting_host_srcs.gypi
@@ -230,12 +230,12 @@
'host/usage_stats_consent_win.cc',
'host/username.cc',
'host/username.h',
+ 'host/video_frame_pump.cc',
+ 'host/video_frame_pump.h',
'host/video_frame_recorder.cc',
'host/video_frame_recorder.h',
'host/video_frame_recorder_host_extension.cc',
'host/video_frame_recorder_host_extension.h',
- 'host/video_frame_pump.cc',
- 'host/video_frame_pump.h',
'host/win/com_imported_mstscax.tlh',
'host/win/com_security.cc',
'host/win/com_security.h',
diff --git a/remoting/remoting_nacl.gyp b/remoting/remoting_nacl.gyp
index aa7e848..f642734 100644
--- a/remoting/remoting_nacl.gyp
+++ b/remoting/remoting_nacl.gyp
@@ -64,8 +64,8 @@
'<(proto_out_dir)/control.pb.cc',
'<(proto_out_dir)/event.pb.cc',
'<(proto_out_dir)/internal.pb.cc',
- '<(proto_out_dir)/video.pb.cc',
'<(proto_out_dir)/mux.pb.cc',
+ '<(proto_out_dir)/video.pb.cc',
],
'extra_deps': [ '<@(files_list)' ],
'extra_args': [ '<@(files_list)' ],