summaryrefslogtreecommitdiffstats
path: root/apps/apps.gypi
diff options
context:
space:
mode:
authorHokein.Wu@gmail.com <Hokein.Wu@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-05 06:14:14 +0000
committerHokein.Wu@gmail.com <Hokein.Wu@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-05 06:14:14 +0000
commit94b09a7d820ce27ff76f3f4f4eb100bf9a035447 (patch)
tree973b63d37f88c5ab78b09efa9201d930dd5f53ec /apps/apps.gypi
parentd8f7d16ef3379f82b624f8256ab066045bba28d6 (diff)
downloadchromium_src-94b09a7d820ce27ff76f3f4f4eb100bf9a035447.zip
chromium_src-94b09a7d820ce27ff76f3f4f4eb100bf9a035447.tar.gz
chromium_src-94b09a7d820ce27ff76f3f4f4eb100bf9a035447.tar.bz2
[App Shell] Port app_shell to windows aura.
Allow windows developsers to run app_shell. BUG=None TEST=Build app_shell on windows with use_aura=1, it launches normally. Review URL: https://codereview.chromium.org/136093011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248870 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/apps.gypi')
-rw-r--r--apps/apps.gypi14
1 files changed, 13 insertions, 1 deletions
diff --git a/apps/apps.gypi b/apps/apps.gypi
index 80f2fca..a12a093 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