Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(84)

Side by Side Diff: remoting/remoting_webapp.gypi

Issue 340993002: Revert of Remove NPAPI plugin from chromoting webapp. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « remoting/remoting_host_mac.gypi ('k') | remoting/resources/remoting_strings.grd » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 # 4 #
5 # File included in remoting_webapp_* targets in remoting_client.gypi 5 # File included in remoting_webapp_* targets in remoting_client.gypi
6 6
7 { 7 {
8 'type': 'none', 8 'type': 'none',
9 'variables': { 9 'variables': {
10 'include_host_plugin%': 0,
10 'extra_files%': [], 11 'extra_files%': [],
11 'generated_html_files': [ 12 'generated_html_files': [
12 '<(SHARED_INTERMEDIATE_DIR)/main.html', 13 '<(SHARED_INTERMEDIATE_DIR)/main.html',
13 '<(SHARED_INTERMEDIATE_DIR)/wcs_sandbox.html', 14 '<(SHARED_INTERMEDIATE_DIR)/wcs_sandbox.html',
14 ], 15 ],
15 }, 16 },
16 'dependencies': [ 17 'dependencies': [
17 'remoting_resources', 18 'remoting_resources',
18 'remoting_webapp_html', 19 'remoting_webapp_html',
19 ], 20 ],
20 'conditions': [ 21 'conditions': [
22 ['include_host_plugin==1', {
23 'dependencies': [
24 'remoting_host_plugin',
25 ],
26 'variables': {
27 'plugin_path': '<(PRODUCT_DIR)/<(host_plugin_prefix)remoting_host_plugin .<(host_plugin_extension)',
28 'plugin_args': [
29 '--locales', '<@(remoting_host_locale_files)',
30 '--plugin', '<(plugin_path)',
31 ],
32 },
33 }, {
34 'variables': {
35 'plugin_args': [],
36 },
37 }],
21 ['webapp_type=="v2_pnacl"', { 38 ['webapp_type=="v2_pnacl"', {
22 'dependencies': [ 39 'dependencies': [
23 'remoting_nacl.gyp:remoting_client_plugin_nacl', 40 'remoting_nacl.gyp:remoting_client_plugin_nacl',
24 ], 41 ],
25 'variables': { 42 'variables': {
26 'extra_files': [ 43 'extra_files': [
27 'webapp/remoting_client_pnacl.nmf', 44 'webapp/remoting_client_pnacl.nmf',
28 '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe', 45 '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe',
29 ], 46 ],
30 }, 47 },
(...skipping 28 matching lines...) Expand all
59 'inputs': [ 76 'inputs': [
60 'webapp/build-webapp.py', 77 'webapp/build-webapp.py',
61 'webapp/manifest.json.jinja2', 78 'webapp/manifest.json.jinja2',
62 '<(chrome_version_path)', 79 '<(chrome_version_path)',
63 '<(remoting_version_path)', 80 '<(remoting_version_path)',
64 '<@(generated_html_files)', 81 '<@(generated_html_files)',
65 '<@(remoting_webapp_files)', 82 '<@(remoting_webapp_files)',
66 '<@(remoting_webapp_locale_files)', 83 '<@(remoting_webapp_locale_files)',
67 '<@(extra_files)', 84 '<@(extra_files)',
68 ], 85 ],
86 'conditions': [
87 ['include_host_plugin==1', {
88 'inputs': [
89 '<(plugin_path)',
90 '<@(remoting_host_locale_files)',
91 ],
92 }],
93 ],
69 'outputs': [ 94 'outputs': [
70 '<(output_dir)', 95 '<(output_dir)',
71 '<(zip_path)', 96 '<(zip_path)',
72 ], 97 ],
73 'action': [ 98 'action': [
74 'python', 'webapp/build-webapp.py', 99 'python', 'webapp/build-webapp.py',
75 '<(buildtype)', 100 '<(buildtype)',
76 '<(version_full)', 101 '<(version_full)',
102 '<(host_plugin_mime_type)',
77 '<(output_dir)', 103 '<(output_dir)',
78 '<(zip_path)', 104 '<(zip_path)',
79 'webapp/manifest.json.jinja2', 105 'webapp/manifest.json.jinja2',
80 '<(webapp_type)', 106 '<(webapp_type)',
81 '<@(generated_html_files)', 107 '<@(generated_html_files)',
82 '<@(remoting_webapp_files)', 108 '<@(remoting_webapp_files)',
83 '<@(extra_files)', 109 '<@(extra_files)',
110 '<@(plugin_args)',
84 '--locales', '<@(remoting_webapp_locale_files)', 111 '--locales', '<@(remoting_webapp_locale_files)',
85 ], 112 ],
86 }, 113 },
87 ], 114 ],
88 } 115 }
OLDNEW
« no previous file with comments | « remoting/remoting_host_mac.gypi ('k') | remoting/resources/remoting_strings.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698