diff options
author | garykac <garykac@chromium.org> | 2015-02-06 16:47:12 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-02-07 00:47:39 +0000 |
commit | 9fb75ed89c0ae4ced679576f9cf030cc8c30e928 (patch) | |
tree | 9f1f7472be0226d68289b1e4bb1fc3902fd0a5da /remoting/remoting_test.gypi | |
parent | 301145111134ce6d2ccdef5a306d40e2217be051 (diff) | |
download | chromium_src-9fb75ed89c0ae4ced679576f9cf030cc8c30e928.zip chromium_src-9fb75ed89c0ae4ced679576f9cf030cc8c30e928.tar.gz chromium_src-9fb75ed89c0ae4ced679576f9cf030cc8c30e928.tar.bz2 |
[Chromoting] Remove wildcard ('*') from remoting_all target.
Support for the wildcard is going away in GN, so this helps prepare for the transition away from GYP.
This cl adds dummy targets so that that logic for when the proper targets should be build can be kept in the platform-specific files.
Some of the conditions in the host gyp files needed to be restructured so that the dummy targets would be defined only when necessary. The updated conditions caused a lot of lines to be re-indented, but the target definitions are the same (except for the new dummy targets).
BUG=
Review URL: https://codereview.chromium.org/896743004
Cr-Commit-Position: refs/heads/master@{#315150}
Diffstat (limited to 'remoting/remoting_test.gypi')
-rw-r--r-- | remoting/remoting_test.gypi | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/remoting/remoting_test.gypi b/remoting/remoting_test.gypi index 0b97aa22..7d584ae 100644 --- a/remoting/remoting_test.gypi +++ b/remoting/remoting_test.gypi @@ -265,6 +265,7 @@ 'dependencies!': [ 'remoting_host', 'remoting_host_setup_base', + 'remoting_it2me_host_static', 'remoting_native_messaging_base', ], 'sources/': [ @@ -273,14 +274,6 @@ ['exclude', '^base/resources_unittest\\.cc$'], ] }], - ['enable_it2me_host == 0', { - 'dependencies!': [ - 'remoting_it2me_host_static', - ], - 'sources/': [ - ['exclude', '^host/it2me/'], - ] - }], [ 'OS == "linux" and use_allocator!="none"', { 'dependencies': [ '../base/allocator/allocator.gyp:allocator', @@ -299,7 +292,7 @@ '<@(remoting_webapp_js_browser_test_files)', ], }, - ], #end of copies + ], # end of copies }, # end of target 'remoting_browser_test_resources' { 'target_name': 'remoting_webapp_unittest', @@ -373,7 +366,7 @@ ], }, ], - }, # end of target 'remoting_webapp_js_unittest' + }, # end of target 'remoting_webapp_unittest' ], # end of targets 'conditions': [ |