diff options
| author | garykac <garykac@chromium.org> | 2015-05-15 17:21:05 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-16 00:21:06 +0000 |
| commit | c1fd3a3d2e9c4f8117ab6650289cebc0bb9553e7 (patch) | |
| tree | a95213bea88cfc0b5aca4e5dd398079a7de26cb0 /remoting/remoting_client.gypi | |
| parent | fc86d6bda541bd5725aa29acec1fe130ec452fe4 (diff) | |
| download | chromium_src-c1fd3a3d2e9c4f8117ab6650289cebc0bb9553e7.zip chromium_src-c1fd3a3d2e9c4f8117ab6650289cebc0bb9553e7.tar.gz chromium_src-c1fd3a3d2e9c4f8117ab6650289cebc0bb9553e7.tar.bz2 | |
[Chromoting] Add GN build support for ar_sample_app target.
This adds GN build rules for the AppRemoting sample app.
Some DesktopRemoting build rules were prettified as part of this
process (to make the App- and Desktop- remoting build rules more
similar).
This re-re-lands crrev.com/1126393002 without any additional changes
required. The original issues with the GN clobber builds are fixed in
crrev.com/1137753002. The 2nd attempt to land was rejected due to
a merge race (fixed in this cl).
BUG=471916
Review URL: https://codereview.chromium.org/1143643003
Cr-Commit-Position: refs/heads/master@{#330243}
Diffstat (limited to 'remoting/remoting_client.gypi')
| -rw-r--r-- | remoting/remoting_client.gypi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/remoting/remoting_client.gypi b/remoting/remoting_client.gypi index e82139c..bef823d 100644 --- a/remoting/remoting_client.gypi +++ b/remoting/remoting_client.gypi @@ -49,12 +49,11 @@ }, # end of target 'remoting_client' { - # GN version: //remoting/webapp:html + # GN version: See remoting/webapp/build_template.gni 'target_name': 'remoting_webapp_html', 'type': 'none', 'actions': [ { - # GN version: //remoting/webapp:main_html 'action_name': 'Build Remoting Webapp main.html', 'inputs': [ 'webapp/build-html.py', @@ -75,7 +74,6 @@ ], }, { - # GN version: //remoting/webapp:wcs_sandbox_html 'action_name': 'Build Remoting Webapp wcs_sandbox.html', 'inputs': [ 'webapp/build-html.py', @@ -92,7 +90,6 @@ ], }, { - # GN version: //remoting/webapp:background_html 'action_name': 'Build Remoting Webapp background.html', 'inputs': [ 'webapp/build-html.py', @@ -128,6 +125,7 @@ }, # end of target 'remoting_webapp_html' { + # GN version: //remoting/webapp:webapp 'target_name': 'remoting_webapp', 'type': 'none', 'dependencies': [ @@ -143,6 +141,7 @@ }, # end of target 'remoting_webapp' { + # GN version: //remoting/webapp:webapp_v1 'target_name': 'remoting_webapp_v1', 'type': 'none', 'variables': { @@ -158,6 +157,7 @@ ['disable_nacl==0 and disable_nacl_untrusted==0', { 'targets': [ { + # GN version: //remoting/webapp:webapp_v1 'target_name': 'remoting_webapp_v2', 'type': 'none', 'variables': { |