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

diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidDataWriter.java b/src/tools/android/java/com/google/devtools/build/android/AndroidDataWriter.java
index f1db567bb0..92e674cb43 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidDataWriter.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidDataWriter.java
@@ -369,8 +369,9 @@ public class AndroidDataWriter implements AndroidDataWritingVisitor {
     }
 
     @Override
-    public ValuesResourceDefinition derivedFrom(final Path source) {
-      final SegmentMapper mapper = SegmentMapper.create(segments, adopted, segmentsKey, source);
+    public ValuesResourceDefinition derivedFrom(final DataSource source) {
+      final SegmentMapper mapper =
+          SegmentMapper.create(segments, adopted, segmentsKey, source.getPath());
       return new StringValuesResourceDefinition(mapper);
     }
   }