Fix Windows GN build.
This sets use_aura on Windows in all cases (fixes base build). Passes new argument to gyp link wrapper (GYP revision 1835). R=sky@chromium.org TBR=sky Review URL: https://codereview.chromium.org/137993014 git-svn-id: http://src.chromium.org/svn/trunk/src/build@244840 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
c2b3031962
Коммит
c30951c463
|
@ -31,6 +31,10 @@ config("my_msvs") {
|
|||
"ENABLE_SETTINGS_APP=1",
|
||||
"ENABLE_MANAGED_USERS=1",
|
||||
]
|
||||
|
||||
if (use_aura) {
|
||||
defines += [ "USE_AURA=1" ]
|
||||
}
|
||||
}
|
||||
|
||||
config("feature_flags") {
|
||||
|
|
|
@ -105,6 +105,9 @@ if (os == "win") {
|
|||
is_nacl = false
|
||||
is_posix = false
|
||||
is_win = true
|
||||
|
||||
# Windows currelty implies Aura.
|
||||
use_aura = true
|
||||
} else if (os == "mac") {
|
||||
is_android = false
|
||||
is_chromeos = false
|
||||
|
|
|
@ -58,7 +58,7 @@ toolchain("32") {
|
|||
description = "ASM \$in"
|
||||
}
|
||||
tool("alink") {
|
||||
command = "$python_path gyp-win-tool link-wrapper environment.x86 lib.exe /nologo /ignore:4221 /OUT:\$out @\$out.rsp"
|
||||
command = "$python_path gyp-win-tool link-wrapper environment.x86 False lib.exe /nologo /ignore:4221 /OUT:\$out @\$out.rsp"
|
||||
description = "LIB \$out"
|
||||
rspfile = "\$out.rsp"
|
||||
rspfile_content = "\$in_newline \$libflags"
|
||||
|
|
Загрузка…
Ссылка в новой задаче