diff options
| author |  corysmith <corysmith@google.com> | 2017-06-15 00:13:13 +0200 |
|---|---|---|
| committer |  Yun Peng <pcloudy@google.com> | 2017-06-16 09:26:49 +0200 |
| commit | 951e4bb931d226519b13eab055332e30d16eab00 (patch) | |
| tree | 3d797fd920a30935e8a5324c4d65d45e635364bd /src/tools/android/java | |
| parent | 51dcd2830647817ef956563a45c33966bd65b096 (diff) | |
Automated g4 rollback of commit 5c2dc673a3ad2aa52f25c6f7d767671ba3e9b02c.
*** Reason for rollback ***
Appears that the generated R classes are not correct, causing test failures.
*** Original change description ***
Automated g4 rollback of commit 1be84ee92a825694b0c0026ac77134f8a084bd9c.
*** Reason for rollback ***
Rolling forward with the generated resources directory being created for tests without resources.
*** Original change description ***
Automated g4 rollback of commit d028d7854d3e95d97143945a1ec32944e5e4594b.
*** Reason for rollback ***
Breaks 1000+ targets in the depot: []
*** Original change description ***
Generate pre-reconciled ids R classes for dependen...
***
RELNOTES: None
PiperOrigin-RevId: 159032530
Diffstat (limited to 'src/tools/android/java')
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/GenerateRobolectricResourceSymbolsAction.java b/src/tools/android/java/com/google/devtools/build/android/GenerateRobolectricResourceSymbolsAction.java index 0857fe37fd..e95b646d6d 100644 --- a/src/tools/android/java/com/google/devtools/build/android/GenerateRobolectricResourceSymbolsAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/GenerateRobolectricResourceSymbolsAction.java @@ -30,7 +30,6 @@ import com.google.devtools.common.options.OptionsBase; import com.google.devtools.common.options.OptionsParser; import java.io.Closeable; import java.nio.file.FileSystems; -import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; import java.util.List; @@ -107,7 +106,7 @@ public class GenerateRobolectricResourceSymbolsAction { try (ScopedTemporaryDirectory scopedTmp = new ScopedTemporaryDirectory("robolectric_resources_tmp")) { Path tmp = scopedTmp.getPath(); - Path generatedSources = Files.createDirectories(tmp.resolve("generated_resources")); + Path generatedSources = tmp.resolve("generated_resources"); // The reported availableProcessors may be higher than the actual resources // (on a shared system). On the other hand, a lot of the work is I/O, so it's not completely // CPU bound. As a compromise, divide by 2 the reported availableProcessors. diff --git a/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java b/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java index 4fb15a52d8..ebc89df41f 100644 --- a/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java @@ -34,6 +34,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; import java.util.logging.Logger; + /** * Provides an entry point for the compiling resource classes using a custom compiler (simply parse * R.txt and make a jar, which is simpler than parsing R.java and running errorprone, etc.). |