4.99 of 5: Fix styleable combining.

Changes non-overwriting resources (id and styleable) to combine on duplication. This change ignores the issue of multiple sources, which will be addressed in a later cl.

--
MOS_MIGRATED_REVID=121840285

1 files changed, 9 insertions, 0 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/XmlResourceValue.java b/src/tools/android/java/com/google/devtools/build/android/XmlResourceValue.java
index dc916db8d4..e10bf46c40 100644
--- a/src/tools/android/java/com/google/devtools/build/android/XmlResourceValue.java
+++ b/src/tools/android/java/com/google/devtools/build/android/XmlResourceValue.java
@@ -34,4 +34,13 @@ public interface XmlResourceValue {
    * Serializes the resource value to the OutputStream and returns the bytes written.
    */
   int serializeTo(Path source, OutputStream out) throws IOException;
+  
+  /**
+   * Combines these xml values together and returns a single value.
+   * 
+   * @param value Another resource to be combined with this one.
+   * @return A union of the values of these two values.
+   * @throws IllegalArgumentException if either value cannot combine with the other.
+   */
+  XmlResourceValue combineWith(XmlResourceValue value);
 }