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

Unified Diff: apps/apps.gypi

Issue 136093011: [App Shell] Port app_shell to windows aura. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 10 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 | apps/shell/app/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/apps.gypi
diff --git a/apps/apps.gypi b/apps/apps.gypi
index 80f2fca5279105243824d2eadab550b91df20467..a12a0939ee173075d9cf6b2ac304b476111838bc 100644
--- a/apps/apps.gypi
+++ b/apps/apps.gypi
@@ -97,7 +97,7 @@
},
], # targets
'conditions': [
- ['chromeos==1 or (OS=="linux" and use_aura==1)', {
+ ['chromeos==1 or (OS=="linux" and use_aura==1) or (OS=="win" and use_aura==1)', {
'targets': [
{
'target_name': 'app_shell',
@@ -148,6 +148,18 @@
'shell/renderer/shell_content_renderer_client.cc',
'shell/renderer/shell_content_renderer_client.h',
],
+ 'conditions': [
+ ['OS=="win"', {
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
+ },
+ },
+ 'dependencies': [
+ '../sandbox/sandbox.gyp:sandbox',
+ ],
+ }],
+ ],
},
], # targets
}], # chromeos==1
« no previous file with comments | « no previous file | apps/shell/app/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698