Wrap the source Path in a DataSource object.

The DataSource object will then be used to track which values have been
overwritten and avoid incorrect merge warnings.

--
MOS_MIGRATED_REVID=137159260

1 files changed, 2 insertions, 3 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/DataValue.java b/src/tools/android/java/com/google/devtools/build/android/DataValue.java
index e8427a4a34..8876c010d6 100644
--- a/src/tools/android/java/com/google/devtools/build/android/DataValue.java
+++ b/src/tools/android/java/com/google/devtools/build/android/DataValue.java
@@ -15,7 +15,6 @@ package com.google.devtools.build.android;
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.nio.file.Path;
 
 /**
  * Represents the value associated with DataKey interface for resource and asset values.
@@ -25,9 +24,9 @@ import java.nio.file.Path;
 public interface DataValue {
 
   /**
-   * Provides the Path to the file from which the DataValue was derived.
+   * Provides the DataSource, which contains metadata about the original xml it was derived from.
    */
-  Path source();
+  DataSource source();
 
   /**
    * Serializes to a supplied stream and returns the number of bytes written.