Skip to content

Commit

Permalink
Add remoting_host target to chromium_builder_webrtc dependencies (re-…
Browse files Browse the repository at this point in the history
…land)

It turns out the remoting_host target should be in a condition to avoid
failing building for some platforms.
Previous https://codereview.chromium.org/706753003/ was reverted because
of breaking Chrome OS Ozone.

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

Cr-Commit-Position: refs/heads/master@{#304206}
  • Loading branch information
kjellander authored and Commit bot committed Nov 14, 2014
1 parent c1b4109 commit e766084
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions build/all.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -689,6 +689,13 @@
'../third_party/webrtc/tools/tools.gyp:frame_analyzer',
'../third_party/webrtc/tools/tools.gyp:rgba_to_i420_converter',
],
'conditions': [
['remoting==1', {
'dependencies': [
'../remoting/remoting.gyp:*',
],
}],
],
}, # target_name: chromium_builder_webrtc
{
'target_name': 'chromium_builder_chromedriver',
Expand Down Expand Up @@ -868,6 +875,8 @@
'../tools/android/android_tools.gyp:android_tools',
'../tools/android/android_tools.gyp:memconsumer',
# Unit test bundles packaged as an apk.
'../components/devtools_bridge.gyp:devtools_bridge_tests_apk',
'../components/devtools_bridge.gyp:devtools_bridge_tests2_apk',
'../content/content_shell_and_tests.gyp:content_browsertests_apk',
],
}, # target_name: android_builder_chromium_webrtc
Expand Down

0 comments on commit e766084

Please sign in to comment.