Part 3 of 5: Merging semantics.

Introduces the AndroidDataMerger, MergeConflict, and UnwrittenMergedAndroidData which is the entry point in the AndroidResourceProcessing *AndroidData lifecycle.

Also, refactors the AndroidDataSet parsing of resources, making it functionally immutable.

--
MOS_MIGRATED_REVID=117492690

1 files changed, 11 insertions, 1 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 96d765e110..4e64fb7ae3 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
@@ -19,7 +19,17 @@ import java.nio.file.Path;
 /**
  * Represents an Android Resource parsed from an xml or binary file.
  */
-public interface DataResource {
+public interface DataResource extends Comparable<DataResource> {
+
+  /**
+   * Provides the FullyQualifiedName of the DataResource
+   */
+  FullyQualifiedName fullyQualifiedName();
+
+  /**
+   * Provides the Path to the file from which the DataResource was derived.
+   */
+  Path source();
 
   /**
    * Writes the resource to the given resource directory.