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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/remoting_host_mac.gypi ('k') | remoting/resources/remoting_strings.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/remoting_webapp.gypi
diff --git a/remoting/remoting_webapp.gypi b/remoting/remoting_webapp.gypi
index 38122db11d07d3e754b3923c612443a34bfa0e79..871a876af65507947bab2db5c87ddd28c13fa11b 100644
--- a/remoting/remoting_webapp.gypi
+++ b/remoting/remoting_webapp.gypi
@@ -7,6 +7,7 @@
{
'type': 'none',
'variables': {
+ 'include_host_plugin%': 0,
'extra_files%': [],
'generated_html_files': [
'<(SHARED_INTERMEDIATE_DIR)/main.html',
@@ -18,6 +19,22 @@
'remoting_webapp_html',
],
'conditions': [
+ ['include_host_plugin==1', {
+ 'dependencies': [
+ 'remoting_host_plugin',
+ ],
+ 'variables': {
+ 'plugin_path': '<(PRODUCT_DIR)/<(host_plugin_prefix)remoting_host_plugin.<(host_plugin_extension)',
+ 'plugin_args': [
+ '--locales', '<@(remoting_host_locale_files)',
+ '--plugin', '<(plugin_path)',
+ ],
+ },
+ }, {
+ 'variables': {
+ 'plugin_args': [],
+ },
+ }],
['webapp_type=="v2_pnacl"', {
'dependencies': [
'remoting_nacl.gyp:remoting_client_plugin_nacl',
@@ -66,6 +83,14 @@
'<@(remoting_webapp_locale_files)',
'<@(extra_files)',
],
+ 'conditions': [
+ ['include_host_plugin==1', {
+ 'inputs': [
+ '<(plugin_path)',
+ '<@(remoting_host_locale_files)',
+ ],
+ }],
+ ],
'outputs': [
'<(output_dir)',
'<(zip_path)',
@@ -74,6 +99,7 @@
'python', 'webapp/build-webapp.py',
'<(buildtype)',
'<(version_full)',
+ '<(host_plugin_mime_type)',
'<(output_dir)',
'<(zip_path)',
'webapp/manifest.json.jinja2',
@@ -81,6 +107,7 @@
'<@(generated_html_files)',
'<@(remoting_webapp_files)',
'<@(extra_files)',
+ '<@(plugin_args)',
'--locales', '<@(remoting_webapp_locale_files)',
],
},
« 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