4.9 of 5: Writer fixes for integration.

* Uses the png cruncher for crunching pngs.
* Respects qualifiers when generating the values/values.xml.
* Improvements to testability.
* Standardizes on throwing merging exceptions instead of random IOExceptions.

--
MOS_MIGRATED_REVID=121483439

1 files changed, 3 insertions, 1 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidDataWritingVisitor.java b/src/tools/android/java/com/google/devtools/build/android/AndroidDataWritingVisitor.java
index 55ce652bf1..01c8106afb 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidDataWritingVisitor.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidDataWritingVisitor.java
@@ -41,7 +41,8 @@ public interface AndroidDataWritingVisitor {
    * @param relativeDestinationPath The relative destination path to write the resource to.
    * @throws IOException if there are errors during copying.
    */
-  void copyResource(Path source, String relativeDestinationPath) throws IOException;
+  void copyResource(Path source, String relativeDestinationPath)
+      throws IOException;
 
   /**
    * Adds a xml string fragment to the values file.
@@ -49,5 +50,6 @@ public interface AndroidDataWritingVisitor {
    * @param key Used to ensure a constant order of the written xml.
    * @param xmlFragment the xml fragment as an Iterable<String> which allows lazy generation.
    */
+  // TODO(corysmith): Change this to pass in a xml writer. Safer all around.
   void writeToValuesXml(FullyQualifiedName key, Iterable<String> xmlFragment);
 }