Pull buildtools to get GN r282653

This uses the proto file directory for the generated files rather than the directory of the BUILD file. This makes it more natural when you have a BUILD file in a different directory than the proto files.

Fixes a search-and-replace error that accidentally changed the fallback source_prereqs code to use "inputs".

Fix ozone build.

BUG=
R=ajwong@chromium.org

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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@282998 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
brettw@chromium.org 2014-07-14 19:25:57 +00:00
Родитель b3fbfbcfa0
Коммит c130bf8c6d
1 изменённых файлов: 6 добавлений и 3 удалений

Просмотреть файл

@ -187,9 +187,12 @@ template("grit") {
grit_flags,
"list lines")
# The inputs are relative to the current (build) directory, rebase to
# the current one.
grit_outputs = rebase_path(grit_outputs_build_rel, ".", root_build_dir)
# The names returned by grit are relative to the current (build) directory,
# but references to files in this template are expected to be relative to the
# invoking BUILD.gn file's directory. Make it absolute so there's no
# ambiguity.
grit_outputs = get_path_info(
rebase_path(grit_outputs_build_rel, ".", root_build_dir), "abspath")
# The config and the action below get this visibility son only the generated
# source set can depend on them. The variable "target_name" will get