diff options
| author |  Googler <noreply@google.com> | 2016-11-30 22:40:59 +0000 |
|---|---|---|
| committer |  Irina Iancu <elenairina@google.com> | 2016-12-01 10:17:49 +0000 |
| commit | 3e8a15267e9c7fffb6a65ee63e4dd6ec10e522d5 (patch) | |
| tree | 309cb0409b90107bb70a3b7f8b0f6c8d08b24a90 /src/tools/android/java/com/google/devtools/build/android/DataResource.java | |
| parent | 2a2be3907981d9654575493c7012d95d1241f373 (diff) | |
unknown commit of 5: Fixing the merge warning messages in transitive library overwrites.
Record the sources are overwritten during merging.
--
MOS_MIGRATED_REVID=140654137
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/DataResource.java')
| -rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/DataResource.java | 4 |
1 files changed, 3 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 d1836b8a13..b177b9e49b 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 @@ -14,7 +14,6 @@ package com.google.devtools.build.android; import com.android.ide.common.res2.MergingException; - import java.io.IOException; /** @@ -42,4 +41,7 @@ public interface DataResource extends DataValue { void writeResourceToClass( FullyQualifiedName key, AndroidResourceClassWriter resourceClassWriter); + + /** Overwrite another {@link DataResource}. */ + DataResource overwrite(DataResource other); } |