Merge remote-tracking branch 'aosp/upstream'HEADmaster

* aosp/upstream:
  Support git submodules in version.cc generation.
  Link ckati against jemalloc if host machine runs Linux.
  Support building in a git worktree
  Fix flaky test
  Switch to a golang-based test runner
  Refactor source tree into directories

Test: treehugger
Change-Id: I6cca6108531c4c32e3848bf6b532a99aef0f06c2

1 files changed, 40 insertions, 0 deletions

diff --git a/src/file_cache.h b/src/file_cache.h
new file mode 100644
index 0000000..fac2077
--- /dev/null
+++ b/src/file_cache.h
@@ -0,0 +1,40 @@
+// Copyright 2015 Google Inc. All rights reserved
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef FILE_CACHE_H_
+#define FILE_CACHE_H_
+
+#include <string>
+#include <unordered_set>
+
+using namespace std;
+
+class Makefile;
+
+class MakefileCacheManager {
+ public:
+  virtual ~MakefileCacheManager();
+
+  virtual Makefile* ReadMakefile(const string& filename) = 0;
+  virtual void GetAllFilenames(unordered_set<string>* out) = 0;
+
+  static MakefileCacheManager* Get();
+
+ protected:
+  MakefileCacheManager();
+};
+
+MakefileCacheManager* NewMakefileCacheManager();
+
+#endif  // FILE_CACHE_H_