replace obsolete logic for meta tags with include provided by devsite, and add data attributes to the ReferenceObject itemprop tag that carry api level information for the future version of the API level selector. Note that if the build specifies 'library.root' then that is still used to specify the _book.yaml location in a django variable. This way, we still have control from the DevSite include as to whether we use it.
am: ae14dffd83
Change-Id: Ie50e9540b51b4a97e4dc060326b1648d1aad379d
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) {