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, 3 insertions, 5 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/DataResource.java b/src/tools/android/java/com/google/devtools/build/android/DataResource.java
index 06bd6416af..98fef179ba 100644
--- a/src/tools/android/java/com/google/devtools/build/android/DataResource.java
+++ b/src/tools/android/java/com/google/devtools/build/android/DataResource.java
@@ -14,16 +14,14 @@
 package com.google.devtools.build.android;
 
 import java.io.IOException;
-import java.nio.file.Path;
 
 /**
  * Represents an Android Resource parsed from an xml or binary file.
  */
 public interface DataResource extends DataValue {
   /**
-   * Writes the resource to the given resource directory.
-   * @param newResourceDirectory The new directory for this resource.
-   * @throws IOException if there are issues with writing the resource.
+   * Write as a resource using the supplied {@link MergeDataWriter}.
    */
-  void write(Path newResourceDirectory) throws IOException;
+  void writeResource(FullyQualifiedName key, AndroidDataWritingVisitor mergedDataWriter)
+      throws IOException;
 }