diff options
author | Googler <noreply@google.com> | 2016-08-16 13:48:27 +0000 |
---|---|---|
committer | Philipp Wollermann <philwo@google.com> | 2016-08-17 11:23:30 +0000 |
commit | 114c62b5808af78ed78722682351a2d34ff1d0b6 (patch) | |
tree | d3772e7b6c31c14f7ed93f15248f59bec50bfe45 /src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java | |
parent | 29e910b0a637275d33aca40ad620961d4f32a529 (diff) |
Handle public tags in merger -> R.class writer
Developers do use public tags, and before this change
it would assert in the AndroidResourceClassWriter
as an unhandled ResourceType. We probably didn't want
to write out a R.public.field anyway.
Also, handle public tags with the same name,
but different type. They get mapped to the same FQN,
so use the combining mechanism to keep track of
the different types and ids.
--
MOS_MIGRATED_REVID=130395089
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java')
-rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java b/src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java index ad3fe2427e..6add521689 100644 --- a/src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java +++ b/src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java @@ -282,7 +282,9 @@ public class FullyQualifiedName implements DataKey { } public static boolean isOverwritable(FullyQualifiedName name) { - return !(name.resourceType == ResourceType.ID || name.resourceType == ResourceType.STYLEABLE); + return !(name.resourceType == ResourceType.ID + || name.resourceType == ResourceType.PUBLIC + || name.resourceType == ResourceType.STYLEABLE); } /** |