Update doclava template to include ReferenceObject meta data for devsite but only include the 'path' information for DAC docs because I'm not sure how other projects want to use that field https://developers.google.com/internal/publishing/reference/microdata/referenceobject bug: 62869488
am: 42466d0f94
Change-Id: I11d3d532bd8fc71e582d37ea0d553267abaf10e7
diff --git a/Android.mk b/Android.mk
index 7e7686d..ed9eb8c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -25,7 +25,7 @@
guavalib \
antlr-runtime
-LOCAL_STATIC_JAVA_LIBRARIES += tagsouplib
+LOCAL_STATIC_JAVA_LIBRARIES += tagsoup
LOCAL_CLASSPATH := \
$(HOST_JDK_TOOLS_JAR)
diff --git a/src/com/google/doclava/Converter.java b/src/com/google/doclava/Converter.java
index 0d4e455..71c7acb 100644
--- a/src/com/google/doclava/Converter.java
+++ b/src/com/google/doclava/Converter.java
@@ -614,7 +614,10 @@
@Override
protected Object keyFor(Object o) {
Type t = (Type) o;
- String keyString = o.getClass().getName() + "/" + o.toString() + "/";
+ while (t.asAnnotatedType() != null) {
+ t = t.asAnnotatedType().underlyingType();
+ }
+ String keyString = t.getClass().getName() + "/" + t.toString() + "/";
if (t.asParameterizedType() != null) {
keyString += t.asParameterizedType().toString() + "/";
if (t.asParameterizedType().typeArguments() != null) {