Revert "Revert "Merge remote-tracking branch 'aosp/upstream'""

This reverts commit ed8db98c45fca52926d6c1bf88bf9e6752e0c453.

1 files changed, 3 insertions, 1 deletions

diff --git a/ninja.h b/ninja.h
index f117f2b..89683e8 100644
--- a/ninja.h
+++ b/ninja.h
@@ -32,7 +32,9 @@ void GenerateNinja(const vector<DepNode*>& nodes,
                    const string& orig_args,
                    double start_time);
 
-bool NeedsRegen(double start_time, const string& orig_args);
+string GetNinjaFilename();
+string GetNinjaShellScriptFilename();
+string GetNinjaStampFilename();
 
 // Exposed only for test.
 bool GetDepfileFromCommand(string* cmd, string* out);