commit 2979d385cb53ce8843d34bdff027540a9be9b031
author Treehugger Robot <treehugger-gerrit@google.com> Thu Nov 15 00:37:03 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 15 00:37:03 2018 +0000
tree a4349ce6b46e3987bb8900ec54d3283407244524
parent baa4818925c227e26da172ced27e496996d382fa
parent d2f58888949645a9b08cd1b8954bc32b8145c6a8

Merge "base: TemporaryDir add DoNotRemove() method"

base/file.cpp

diff --git a/base/file.cpp b/base/file.cpp
index 7a14711..d5bb7fe 100644
--- a/base/file.cpp
+++ b/base/file.cpp
@@ -134,6 +134,8 @@
 }
 
 TemporaryDir::~TemporaryDir() {
+  if (!remove_dir_and_contents_) return;
+
   auto callback = [](const char* child, const struct stat*, int file_type, struct FTW*) -> int {
     switch (file_type) {
       case FTW_D:

base/include/android-base/file.h

diff --git a/base/include/android-base/file.h b/base/include/android-base/file.h
index 80d7134..f8748b5 100644
--- a/base/include/android-base/file.h
+++ b/base/include/android-base/file.h
@@ -61,12 +61,16 @@
  public:
   TemporaryDir();
   ~TemporaryDir();
+  // Don't remove the temporary dir in the destructor.
+  void DoNotRemove() { remove_dir_and_contents_ = false; }
 
   char path[1024];
 
  private:
   bool init(const std::string& tmp_dir);
 
+  bool remove_dir_and_contents_ = true;
+
   DISALLOW_COPY_AND_ASSIGN(TemporaryDir);
 };