Merge upstream commit '0a2e2cae' into master

* commit '0a2e2cae7038ce519b0524c07d7135c3e520c9cd':
  Restore depfile toleration of multiple output paths on distinct lines
  Fix depfile parser handling of multiple rules
  Fix depfile parser test case line continuation
  Re-arrange depfile parser token processing logic
  Re-generate depfile parser with re2cc 1.0.1

depfile_parser.cc conflicts were handled by regenerating with re2c

The other conflicts were all fairly simple argument/option ordering.

Test: compare .ninja_deps of a full android build before and after this
      change, they're equivalent
Change-Id: I74b7fc56e035c9dbab4c987b6af17329c596a898

1 files changed, 3 insertions, 2 deletions

diff --git a/src/build.cc b/src/build.cc
index 045331b..2f8b860 100644
--- a/src/build.cc
+++ b/src/build.cc
@@ -359,7 +359,8 @@ Builder::Builder(State* state, const BuildConfig& config,
                  int64_t start_time_millis)
     : state_(state), config_(config), status_(status),
       start_time_millis_(start_time_millis), disk_interface_(disk_interface),
-      scan_(state, build_log, deps_log, disk_interface, config.uses_phony_outputs) {
+      scan_(state, build_log, deps_log, disk_interface,
+            &config_.depfile_parser_options, config.uses_phony_outputs) {
 }
 
 Builder::~Builder() {
@@ -802,7 +803,7 @@ bool Builder::ExtractDeps(CommandRunner::Result* result,
     if (content.empty())
       return true;
 
-    DepfileParser deps;
+    DepfileParser deps(config_.depfile_parser_options);
     if (!deps.Parse(&content, err))
       return false;