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

Unified Diff: remoting/remoting.gyp

Issue 11875021: Allow an AppsV2 build to be configured using GYP. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reviewer comments. Created 7 years, 11 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 | « no previous file | remoting/webapp/appsv2.patch » ('j') | remoting/webapp/build-webapp.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 26eb6fc5e4f28fceb77c200c5213fca1a6d22584..c1fad79353d38524b92e7beaa09bbd10824e5826 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -21,6 +21,7 @@
'remoting_host_linux_clipboard%': 1,
'remoting_multi_process%': '<(remoting_multi_process)',
+ 'remoting_use_apps_v2%': 0,
# The |major|, |build| and |patch| versions are inherited from Chrome.
# Since Chrome's |minor| version is always '0', we replace it with a
@@ -1705,8 +1706,10 @@
'webapp/build-webapp.py',
'<(remoting_version_path)',
'<(chrome_version_path)',
+ '<@(remoting_webapp_patch_files)',
'<@(remoting_webapp_files)',
'<@(remoting_webapp_js_files)',
+ '<@(remoting_webapp_apps_v2_js_files)',
'<@(remoting_webapp_locale_files)',
],
@@ -1723,6 +1726,22 @@
'remoting_host_plugin',
],
}],
+ ['remoting_use_apps_v2==1', {
+ 'variables': {
+ 'remoting_webapp_patch_files': [
+ 'webapp/appsv2.patch',
+ ],
+ 'remoting_webapp_apps_v2_js_files': [
+ 'webapp/background.js',
+ 'webapp/identity.js',
+ ],
+ },
+ }, {
+ 'variables': {
+ 'remoting_webapp_patch_files': [],
+ 'remoting_webapp_apps_v2_js_files': [],
+ },
+ }],
],
# Can't use a 'copies' because we need to manipulate
@@ -1740,8 +1759,10 @@
'webapp/build-webapp.py',
'<(remoting_version_path)',
'<(chrome_version_path)',
+ '<@(remoting_webapp_patch_files)',
'<@(remoting_webapp_files)',
'<@(remoting_webapp_js_files)',
+ '<@(remoting_webapp_apps_v2_js_files)',
'<@(remoting_webapp_locale_files)',
],
'conditions': [
@@ -1765,8 +1786,11 @@
'<(plugin_path)',
'<@(remoting_webapp_files)',
'<@(remoting_webapp_js_files)',
+ '<@(remoting_webapp_apps_v2_js_files)',
'--locales',
'<@(remoting_webapp_locale_files)',
+ '--patches',
+ '<@(remoting_webapp_patch_files)',
],
'msvs_cygwin_shell': 1,
},
« no previous file with comments | « no previous file | remoting/webapp/appsv2.patch » ('j') | remoting/webapp/build-webapp.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698