aboutsummaryrefslogtreecommitdiffstats
path: root/dep.cc
diff options
context:
space:
mode:
authorShinichiro Hamaji <shinichiro.hamaji@gmail.com>2015-06-26 07:33:16 +0900
committerShinichiro Hamaji <shinichiro.hamaji@gmail.com>2015-06-26 16:42:23 +0900
commit2e23e4a2954b162436fb77c43518941c88eb4978 (patch)
treed62997a199417d84a1b6eccf97c32d7257167d0e /dep.cc
parent485f9129aac3b132a60dd3006465e794ec0303cb (diff)
downloadandroid_build_kati-2e23e4a2954b162436fb77c43518941c88eb4978.tar.gz
android_build_kati-2e23e4a2954b162436fb77c43518941c88eb4978.tar.bz2
android_build_kati-2e23e4a2954b162436fb77c43518941c88eb4978.zip
[C++] Fix merge_output_pattern.mk
Diffstat (limited to 'dep.cc')
-rw-r--r--dep.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/dep.cc b/dep.cc
index 4e51349..efa6608 100644
--- a/dep.cc
+++ b/dep.cc
@@ -158,9 +158,8 @@ class DepBuilder {
r->cmds = old_rule.cmds;
}
- // If the latter rule has a command (regardless of the
- // commands in oldRule), inputs in the latter rule has a
- // priority.
+ // If the latter rule has a command (regardless of the commands in
+ // |old_rule|), inputs in the latter rule has a priority.
if (rule.cmds.empty()) {
r->inputs = old_rule.inputs;
copy(rule.inputs.begin(), rule.inputs.end(),