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, 6 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/DataAsset.java b/src/tools/android/java/com/google/devtools/build/android/DataAsset.java
index 08dcab4eb8..cbb2f77101 100644
--- a/src/tools/android/java/com/google/devtools/build/android/DataAsset.java
+++ b/src/tools/android/java/com/google/devtools/build/android/DataAsset.java
@@ -14,17 +14,14 @@
 package com.google.devtools.build.android;
 
 import java.io.IOException;
-import java.nio.file.Path;
 
 /**
  * Represents an Asset created from a binary file.
  */
 public interface DataAsset extends DataValue {
-
   /**
-   * Writes the asset to the given asset directory.
-   * @param newAssetDirectory The new directory for this asset.
-   * @throws IOException if there are issues with writing the asset.
+   * Write the asset value to mergedDataWriter.
    */
-  void write(Path newAssetDirectory) throws IOException;
+  void writeAsset(RelativeAssetPath key, AndroidDataWritingVisitor mergedDataWriter)
+      throws IOException;
 }