Don't clean-up externally set dump dir

If the lambda dump dir has been set externally,
its content will not be removed after
Desugar ends.

RELNOTES: n/a
PiperOrigin-RevId: 154554712

1 files changed, 4 insertions, 6 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/Desugar.java b/src/tools/android/java/com/google/devtools/build/android/desugar/Desugar.java
index cd6b6ab989..ca7032e4bc 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/Desugar.java
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/Desugar.java
@@ -528,15 +528,13 @@ class Desugar {
    */
   private static Path createAndRegisterLambdaDumpDirectory() throws IOException {
     String propertyValue = System.getProperty(LambdaClassMaker.LAMBDA_METAFACTORY_DUMPER_PROPERTY);
-    Path dumpDirectory;
     if (propertyValue != null) {
-      dumpDirectory = Paths.get(propertyValue);
-    } else {
-      dumpDirectory = Files.createTempDirectory("lambdas");
-      System.setProperty(
-          LambdaClassMaker.LAMBDA_METAFACTORY_DUMPER_PROPERTY, dumpDirectory.toString());
+      return Paths.get(propertyValue);
     }
 
+    Path dumpDirectory = Files.createTempDirectory("lambdas");
+    System.setProperty(
+        LambdaClassMaker.LAMBDA_METAFACTORY_DUMPER_PROPERTY, dumpDirectory.toString());
     deleteTreeOnExit(dumpDirectory);
     return dumpDirectory;
   }