summaryrefslogtreecommitdiffstats
path: root/remoting/remoting_all.gyp
diff options
context:
space:
mode:
authorsergeyu <sergeyu@chromium.org>2015-07-16 14:05:59 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-16 21:06:47 +0000
commit15945fd48ba40b6133434c8dfb7c31b4525af64a (patch)
treee2ec9e92eaf4ad51324675748ff740bf5dfb6959 /remoting/remoting_all.gyp
parent983bc7cb4593bba22510e31ab73e33c21231e009 (diff)
downloadchromium_src-15945fd48ba40b6133434c8dfb7c31b4525af64a.zip
chromium_src-15945fd48ba40b6133434c8dfb7c31b4525af64a.tar.gz
chromium_src-15945fd48ba40b6133434c8dfb7c31b4525af64a.tar.bz2
Cleanup inconsistencies between GN and GYP in //remoting
1. GN builds were not including some tests included in GYP. 2. Replaced test_common target in gyp with test_support. 3. Removed extra *_common targets for test_driver and moved everything to test_support. 4. test_driver can be compiled using GN now. 5. Various other small cleanups. Review URL: https://codereview.chromium.org/1228283004 Cr-Commit-Position: refs/heads/master@{#339119}
Diffstat (limited to 'remoting/remoting_all.gyp')
-rw-r--r--remoting/remoting_all.gyp5
1 files changed, 3 insertions, 2 deletions
diff --git a/remoting/remoting_all.gyp b/remoting/remoting_all.gyp
index 70adde6..a0e4826 100644
--- a/remoting/remoting_all.gyp
+++ b/remoting/remoting_all.gyp
@@ -21,10 +21,11 @@
'../remoting/remoting.gyp:remoting_browser_test_resources',
'../remoting/remoting.gyp:remoting_client',
'../remoting/remoting.gyp:remoting_client_plugin',
+ '../remoting/remoting.gyp:remoting_perftests',
'../remoting/remoting.gyp:remoting_protocol',
- '../remoting/remoting.gyp:remoting_test_common',
- '../remoting/remoting.gyp:remoting_unittests',
'../remoting/remoting.gyp:remoting_resources',
+ '../remoting/remoting.gyp:remoting_test_support',
+ '../remoting/remoting.gyp:remoting_unittests',
'../remoting/remoting.gyp:remoting_webapp',
'../remoting/remoting.gyp:remoting_webapp_html',
'../remoting/remoting.gyp:remoting_webapp_unittests',