diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-09 17:29:31 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-09 17:29:31 +0000 |
| commit | a901cc9a31b96f16796290262cf248abb6432980 (patch) | |
| tree | 95d68e3478fe80cf39d300deeee0f79d2b7ae4fb /third_party/yasm | |
| parent | 8b223a402f963054a7879d5ffa05bad9295863f0 (diff) | |
| download | chromium_src-a901cc9a31b96f16796290262cf248abb6432980.zip chromium_src-a901cc9a31b96f16796290262cf248abb6432980.tar.gz chromium_src-a901cc9a31b96f16796290262cf248abb6432980.tar.bz2 | |
Rename source_prereqs to inputs in the GN build.
This variable changed name.
R=jamesr@chromium.org
Review URL: https://codereview.chromium.org/375873006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282076 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/yasm')
| -rw-r--r-- | third_party/yasm/BUILD.gn | 6 | ||||
| -rw-r--r-- | third_party/yasm/yasm_assemble.gni | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/third_party/yasm/BUILD.gn b/third_party/yasm/BUILD.gn index 4ac36d1..4e0c979 100644 --- a/third_party/yasm/BUILD.gn +++ b/third_party/yasm/BUILD.gn @@ -16,7 +16,7 @@ # 1) yasm -- Sources, flags for the main yasm executable. Also has most of # of the actions and rules that invoke the subprograms. # 2) yasm_config -- General build configuration including setting a -# source_prereqs listing the checked in version of files +# inputs listing the checked in version of files # generated by manually running configure. These manually # generated files are used by all binaries. # 3) yasm_utils -- Object files with memory management and hashing utilities @@ -41,7 +41,7 @@ if (current_toolchain == host_toolchain) { "source/config/$os", "source/patched-yasm", ] - source_prereqs = [ + inputs = [ config_makefile, "source/config/$os/config.h", "source/config/$os/libyasm-stdint.h", @@ -232,7 +232,7 @@ if (current_toolchain == host_toolchain) { } # TODO(ajwong): This should take most of the generated output as - # source_prereqs. + # inputs. deps = [ ":compile_gperf", ":compile_gperf_for_include", diff --git a/third_party/yasm/yasm_assemble.gni b/third_party/yasm/yasm_assemble.gni index 1002aba..5dc4c7c 100644 --- a/third_party/yasm/yasm_assemble.gni +++ b/third_party/yasm/yasm_assemble.gni @@ -29,7 +29,7 @@ # # Example: defines = [ "FOO", "BAR=1" ] # -# source_prereqs, deps, visibility (optional) +# inputs, deps, visibility (optional) # These have the same meaning as in an action. # # Example @@ -115,8 +115,8 @@ template("yasm_assemble") { script = "//third_party/yasm/run_yasm.py" sources = invoker.sources - if (defined(invoker.source_prereqs)) { - source_prereqs = invoker.source_prereqs + if (defined(invoker.inputs)) { + inputs = invoker.inputs } # Executable (first in the args). The binary might be in the root build dir |