Commit 2572fb11 authored by brettw@chromium.org's avatar brettw@chromium.org

Pull GN binary at r276776

This also fixes the yasm build on Windows (where the default toolchain isn't the host toolchain).

R=jamesr@chromium.org

Review URL: https://codereview.chromium.org/336683002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276826 0039d316-1c4b-4281-b951-d872f2087c98
parent 057d79f4
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
# 6) compile_gperf, compile_re2c, etc. -- Actions that invoke programs that # 6) compile_gperf, compile_re2c, etc. -- Actions that invoke programs that
# turn intermediate files into .c files. # turn intermediate files into .c files.
if (default_toolchain == host_toolchain) { if (current_toolchain == host_toolchain) {
# Various files referenced by multiple targets. # Various files referenced by multiple targets.
yasm_gen_include_dir = "$target_gen_dir/include" yasm_gen_include_dir = "$target_gen_dir/include"
......
23442a554665df5e2b6f9cb6280ce98c21f03215 85ec3797a1263b8d633f88b537c6f0840ccbb62e
\ No newline at end of file \ No newline at end of file
9e3e0668bf4e5ee479dadc05a067d2a78f77662a 257458a058760314036e38bdb56647548474b5b3
\ No newline at end of file \ No newline at end of file
d4c109b6bc81a7975da684a8fbe8518de07ffc8f dceee45ef9bfa1b389d504106506e63df0adc9ae
\ No newline at end of file
c9c24e8403e73c61d5b0475970ee97af26066edd 426f62ed6bd80b5c1395705fbee7e2578c521eaa
\ No newline at end of file
...@@ -34,6 +34,8 @@ if (is_android) { ...@@ -34,6 +34,8 @@ if (is_android) {
] ]
} }
grit_info_script = "//tools/grit/grit_info.py"
template("grit") { template("grit") {
assert(defined(invoker.source), assert(defined(invoker.source),
"\"source\" must be defined for the grit template $target_name") "\"source\" must be defined for the grit template $target_name")
...@@ -41,8 +43,6 @@ template("grit") { ...@@ -41,8 +43,6 @@ template("grit") {
"Neither \"sources\" nor \"outputs\" can be defined for the grit " + "Neither \"sources\" nor \"outputs\" can be defined for the grit " +
"template $target_name") "template $target_name")
grit_info_script = "//tools/grit/grit_info.py"
# These are all passed as arguments to the script so have to be relative to # These are all passed as arguments to the script so have to be relative to
# the build directory. # the build directory.
resource_ids = resource_ids =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment