From 559057b2d083bdcfb7c96ffbf05141d3717caedd Mon Sep 17 00:00:00 2001 From: Googler Date: Tue, 7 Jun 2016 15:07:44 +0000 Subject: Small fixes: * Sort the FullyQualifiedNames during writing for determinism. * Crunch all pngs not in raw -- MOS_MIGRATED_REVID=124245017 --- .../java/com/google/devtools/build/android/AndroidDataWriter.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/tools/android/java/com/google/devtools/build') diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidDataWriter.java b/src/tools/android/java/com/google/devtools/build/android/AndroidDataWriter.java index e3e7234f41..3c857f4a78 100644 --- a/src/tools/android/java/com/google/devtools/build/android/AndroidDataWriter.java +++ b/src/tools/android/java/com/google/devtools/build/android/AndroidDataWriter.java @@ -70,7 +70,8 @@ public class AndroidDataWriter implements Flushable, AndroidDataWritingVisitor { StandardOpenOption.CREATE_NEW, StandardOpenOption.WRITE)) { writer.write(START_RESOURCES); - for (FullyQualifiedName key : valueFragments.keySet()) { + for (FullyQualifiedName key : + Ordering.natural().immutableSortedCopy(valueFragments.keySet())) { for (String line : valueFragments.get(key)) { writer.write(line); writer.write(LINE_END); @@ -207,7 +208,7 @@ public class AndroidDataWriter implements Flushable, AndroidDataWritingVisitor { public void copyResource(Path source, String relativeDestinationPath) throws IOException, MergingException { Path destinationPath = resourceDirectory.resolve(relativeDestinationPath); - if (source.getParent().getFileName().toString().startsWith(SdkConstants.DRAWABLE_FOLDER) + if (!source.getParent().getFileName().toString().startsWith(SdkConstants.FD_RES_RAW) && source.getFileName().toString().endsWith(SdkConstants.DOT_PNG)) { try { Files.createDirectories(destinationPath.getParent()); -- cgit v1.2.3