Skip to content

Commit

Permalink
Pull GN binary at r276776
Browse files Browse the repository at this point in the history
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
  • Loading branch information
brettw@chromium.org committed Jun 12, 2014
1 parent 057d79f commit 2572fb1
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion third_party/yasm/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
# 6) compile_gperf, compile_re2c, etc. -- Actions that invoke programs that
# turn intermediate files into .c files.

if (default_toolchain == host_toolchain) {
if (current_toolchain == host_toolchain) {

# Various files referenced by multiple targets.
yasm_gen_include_dir = "$target_gen_dir/include"
Expand Down
2 changes: 1 addition & 1 deletion tools/gn/bin/linux/gn.sha1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
23442a554665df5e2b6f9cb6280ce98c21f03215
85ec3797a1263b8d633f88b537c6f0840ccbb62e
2 changes: 1 addition & 1 deletion tools/gn/bin/linux/gn32.sha1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9e3e0668bf4e5ee479dadc05a067d2a78f77662a
257458a058760314036e38bdb56647548474b5b3
2 changes: 1 addition & 1 deletion tools/gn/bin/mac/gn.sha1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
d4c109b6bc81a7975da684a8fbe8518de07ffc8f
dceee45ef9bfa1b389d504106506e63df0adc9ae
2 changes: 1 addition & 1 deletion tools/gn/bin/win/gn.exe.sha1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c9c24e8403e73c61d5b0475970ee97af26066edd
426f62ed6bd80b5c1395705fbee7e2578c521eaa
4 changes: 2 additions & 2 deletions tools/gn/secondary/tools/grit/grit_rule.gni
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ if (is_android) {
]
}

grit_info_script = "//tools/grit/grit_info.py"

template("grit") {
assert(defined(invoker.source),
"\"source\" must be defined for the grit template $target_name")
assert(!defined(invoker.sources) && !defined(invoker.outputs),
"Neither \"sources\" nor \"outputs\" can be defined for the grit " +
"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
# the build directory.
resource_ids =
Expand Down

0 comments on commit 2572fb1

Please sign in to comment.