diff options
| author |  Googler <noreply@google.com> | 2016-10-25 15:25:09 +0000 |
|---|---|---|
| committer |  John Cater <jcater@google.com> | 2016-10-25 20:19:14 +0000 |
| commit | 7260f0a2c69bfe0fec187099fcea2dd16c331729 (patch) | |
| tree | bab73491fda9476815de0aa1ff80a591041306b9 /src/tools/android/java/com/google/devtools/build/android/AndroidDataWritingVisitor.java | |
| parent | d1f4a167f8080d460dd532eb83b87ab0d0eb4f86 (diff) | |
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
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/AndroidDataWritingVisitor.java')
| -rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/AndroidDataWritingVisitor.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidDataWritingVisitor.java b/src/tools/android/java/com/google/devtools/build/android/AndroidDataWritingVisitor.java index 1b63d2412a..8d1f547dcf 100644 --- a/src/tools/android/java/com/google/devtools/build/android/AndroidDataWritingVisitor.java +++ b/src/tools/android/java/com/google/devtools/build/android/AndroidDataWritingVisitor.java @@ -82,7 +82,7 @@ public interface AndroidDataWritingVisitor extends Flushable { /** Represents the xml values resource meta data. */ @CheckReturnValue interface ValueResourceDefinitionMetadata { - ValuesResourceDefinition derivedFrom(Path source); + ValuesResourceDefinition derivedFrom(DataSource source); } /** Fluent interface to define the xml value for a {@link FullyQualifiedName}. */ |