4.25 of 5: Writing of UnwrittenMergedAndroidData

Introduces the AndroidDataWriter and AndroidDataWritingVisitor to abstract the io operations from the data classes.
Necessary refactoring to the stubbed write method on DataValue in DataAsset.writeAsset and DataResource.writeResource.
New interface for the AttributeValues to reflect the simplifications of writing Resource Attributes.

Of special note is the fact all xml is written into a single file, values.xml. This is following the Gradle convention and aapt has demonstrated a preference of only reading a values.xml and ignoring all other xml files in the values directory. Unless profiling demonstrates an advantage to writing multiple files (which I doubt), this merger carries on this convention.

--
MOS_MIGRATED_REVID=119066611

1 files changed, 8 insertions, 6 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/XmlResourceValue.java b/src/tools/android/java/com/google/devtools/build/android/XmlResourceValue.java
index 2a22a5aa2f..1a3cfd1f66 100644
--- a/src/tools/android/java/com/google/devtools/build/android/XmlResourceValue.java
+++ b/src/tools/android/java/com/google/devtools/build/android/XmlResourceValue.java
@@ -13,16 +13,18 @@
 // limitations under the License.
 package com.google.devtools.build.android;
 
-import java.io.Writer;
+import java.nio.file.Path;
 
 /**
- * An XmlValue is a value extracted from an xml resource in the resource 'values' directory.
+ * An {@link XmlResourceValue} is extracted from xml files in the resource 'values' directory.
  */
 public interface XmlResourceValue {
   /**
-   * Each XmlValue is expected to write a valid representation in xml to the supplied buffer.
-   * @param buffer The buffer for xml output.
-   * @param name The name of the value being written.
+   * Each XmlValue is expected to write a valid representation in xml to the writer.
+   *
+   * @param key The FullyQualified name for the xml resource being written.
+   * @param source The source of the value to allow for proper comment annotation.
+   * @param mergedDataWriter The target writer.
    */
-  void write(Writer buffer, FullyQualifiedName name);
+  void write(FullyQualifiedName key, Path source, AndroidDataWritingVisitor mergedDataWriter);
 }