summaryrefslogtreecommitdiffstats
path: root/remoting/app_remoting_webapp_build.gypi
diff options
context:
space:
mode:
authormsw <msw@chromium.org>2015-05-11 13:23:42 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-11 20:24:02 +0000
commit0374f266283d285a5a5925d43c4f07074e3a5b65 (patch)
treeb8e4657ec8e2a87d68a7259bef3b47e724c8ffdc /remoting/app_remoting_webapp_build.gypi
parent85bad9e7d11461b7599967c9a504da9ac96f11b3 (diff)
downloadchromium_src-0374f266283d285a5a5925d43c4f07074e3a5b65.zip
chromium_src-0374f266283d285a5a5925d43c4f07074e3a5b65.tar.gz
chromium_src-0374f266283d285a5a5925d43c4f07074e3a5b65.tar.bz2
Revert of [Chromoting] Add GN build support for ar_sample_app target. (patchset #1 id:1 of https://codereview.chromium.org/1135933002/)
Reason for revert: Broke GN bots, eg.: http://build.chromium.org/p/chromium.linux/builders/Linux%20GN/builds/28281 Original issue's description: > [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-lands crrev.com/1126393002 without any additional changes > required. The issues with the GN clobber builds are fixed in > crrev.com/1137753002. > > BUG=471916 > > Committed: https://crrev.com/581797d8f76d5855b7f0bed1fe912a038d1d7d25 > Cr-Commit-Position: refs/heads/master@{#329206} TBR=jamiewalch@chromium.org,garykac@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=471916 Review URL: https://codereview.chromium.org/1136673003 Cr-Commit-Position: refs/heads/master@{#329228}
Diffstat (limited to 'remoting/app_remoting_webapp_build.gypi')
-rw-r--r--remoting/app_remoting_webapp_build.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/remoting/app_remoting_webapp_build.gypi b/remoting/app_remoting_webapp_build.gypi
index bc6ffa6..9f7572cb 100644
--- a/remoting/app_remoting_webapp_build.gypi
+++ b/remoting/app_remoting_webapp_build.gypi
@@ -11,7 +11,6 @@
'app_remoting_webapp_files.gypi',
],
- # GN version: See remoting/webapp/build_template.gni
'target_defaults': {
'type': 'none',
@@ -120,6 +119,7 @@
'<(ar_app_manifest_app)', # Manifest template
'app_remoting', # Web app type
'<@(ar_webapp_files)',
+ '<@(ar_generated_html_files)',
'--locales_listfile',
'<(ar_webapp_locales_listfile)',
'--jinja_paths',