diff options
| author |  Googler <noreply@google.com> | 2018-02-15 13:06:05 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-02-15 13:08:04 -0800 |
| commit | d199fe15f3d08552c76f5debebef629efb46f1b4 (patch) | |
| tree | 20819bf81880b7103a605ed786a129454b27080c /src/tools/android/java/com/google/devtools/build/android/aapt2 | |
| parent | b2a396b6091a07c1e9e5036e73dd14d2ff1ec818 (diff) | |
Don't fail if special resource directories contain multiple resources
We run ResourceCompiler#visitFile once per resource file being compiled. If the
file has qualifiers aapt2 doesn't support (es-419 or sr-latn), we copy the file
into a new directory with corrected qualifiers. However, Files.createDirectory
fails if the folder already exists (because, for example, we just copied
another file).
Instead, use Files.createDirectories, which allows the folder to already exist.
RELNOTES: none
PiperOrigin-RevId: 185887192
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/aapt2')
| -rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java b/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java index e6fc4c074d..4d7bb6a492 100644 --- a/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java +++ b/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java @@ -256,7 +256,7 @@ public class ResourceCompiler { if (!renamedResFolder.equals(resFolder)) { file = Files.copy( file, - Files.createDirectory( + Files.createDirectories( outputDirectory.resolve(renamedResFolder)) .resolve(file.getFileName())); } |