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

1 files changed, 4 insertions, 3 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/proto/serialize_format.proto b/src/tools/android/java/com/google/devtools/build/android/proto/serialize_format.proto
index b248555109..0090aefe36 100644
--- a/src/tools/android/java/com/google/devtools/build/android/proto/serialize_format.proto
+++ b/src/tools/android/java/com/google/devtools/build/android/proto/serialize_format.proto
@@ -63,9 +63,10 @@ message DataValueXml {
     ATTR = 1;
     ID = 2;
     PLURAL = 3;
-    SIMPLE = 4;
-    STYLEABLE = 5;
-    STYLE = 6;
+    PUBLIC = 4;
+    SIMPLE = 5;
+    STYLEABLE = 6;
+    STYLE = 7;
   }
 
   optional XmlType type = 1;