diff options
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/DataResourceXml.java')
-rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/DataResourceXml.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/DataResourceXml.java b/src/tools/android/java/com/google/devtools/build/android/DataResourceXml.java index 1fbbd8c81a..39f230dbec 100644 --- a/src/tools/android/java/com/google/devtools/build/android/DataResourceXml.java +++ b/src/tools/android/java/com/google/devtools/build/android/DataResourceXml.java @@ -311,12 +311,16 @@ public class DataResourceXml implements DataResource { } DataResourceXml xmlResource = (DataResourceXml) resource; return createWithNamespaces( - combineSources(xmlResource.source), + source.combine(xmlResource.source), xml.combineWith(xmlResource.xml), namespaces.union(xmlResource.namespaces)); } - private DataSource combineSources(DataSource otherSource) { - return source.combine(otherSource); + @Override + public DataResource overwrite(DataResource resource) { + if (equals(resource)) { + return this; + } + return createWithNamespaces(source.overwrite(resource.source()), xml, namespaces); } } |