From 925fd546efd612bdaab7187404f15a2771fff46d Mon Sep 17 00:00:00 2001 From: Googler Date: Mon, 9 May 2016 15:52:27 +0000 Subject: 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 --- .../java/com/google/devtools/build/android/DataResource.java | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/tools/android/java/com/google/devtools/build/android/DataResource.java') 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 343c0a9222..44d4a9578c 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 @@ -26,4 +26,13 @@ public interface DataResource extends DataValue { */ void writeResource(FullyQualifiedName key, AndroidDataWritingVisitor mergedDataWriter) throws IOException, MergingException; + + /** + * Combines these resource together and returns a single resource. + * + * @param resource Another resource to be combined with this one. + * @return A union of the values of these two resources. + * @throws IllegalArgumentException if either resource cannot combine with the other. + */ + DataResource combineWith(DataResource resource); } -- cgit v1.2.3