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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: extensions/shell/app_shell.gyp

Issue 586583002: Run app_shell on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: jamescook Created 6 years, 3 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 | « extensions/shell/app/shell_main_delegate.cc ('k') | extensions/shell/browser/shell_nacl_browser_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/shell/app_shell.gyp
diff --git a/extensions/shell/app_shell.gyp b/extensions/shell/app_shell.gyp
index 076dd59d59546d4bce196062cff8d5fb9750a528..87bcd3bb9ea4bb791b70e2de03fc8086d385146d 100644
--- a/extensions/shell/app_shell.gyp
+++ b/extensions/shell/app_shell.gyp
@@ -112,12 +112,16 @@
'<(DEPTH)/ui/display/display.gyp:display',
],
}],
+ ['disable_nacl==0 and OS=="linux"', {
+ 'dependencies': [
+ '<(DEPTH)/components/nacl.gyp:nacl_helper',
+ ],
+ }],
['disable_nacl==0', {
'dependencies': [
'<(DEPTH)/components/nacl.gyp:nacl',
'<(DEPTH)/components/nacl.gyp:nacl_browser',
'<(DEPTH)/components/nacl.gyp:nacl_common',
- '<(DEPTH)/components/nacl.gyp:nacl_helper',
'<(DEPTH)/components/nacl.gyp:nacl_renderer',
'<(DEPTH)/components/nacl.gyp:nacl_switches',
],
« no previous file with comments | « extensions/shell/app/shell_main_delegate.cc ('k') | extensions/shell/browser/shell_nacl_browser_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698