Fix 'library.root' HDF value so it appears on all pages. This is a followup for ag/2109007 am: 01c1b12d98
am: ccb7c6d2ea -s ours
Change-Id: Ie25eb51052ca80160bc6b521dcef72bd759b6a6a
diff --git a/res/assets/templates-sdk/head_tag.cs b/res/assets/templates-sdk/head_tag.cs
index 0d85b8c..1f24860 100644
--- a/res/assets/templates-sdk/head_tag.cs
+++ b/res/assets/templates-sdk/head_tag.cs
@@ -82,7 +82,7 @@
elif:samples ?>/samples<?cs
elif:reference ?>/reference<?cs
elif:downloads ?>/downloads<?cs /if ?><?cs
- elif:library.root ?><?cs var:library.root ?><?cs
+ elif:library.root ?>/reference/<?cs var:library.root ?><?cs
else ?><?cs
if:(guide||develop||training||reference||tools||sdk||samples) ?><?cs
if:guide ?>/guide<?cs
diff --git a/src/com/google/doclava/Doclava.java b/src/com/google/doclava/Doclava.java
index 92cdb59..8c29ac7 100644
--- a/src/com/google/doclava/Doclava.java
+++ b/src/com/google/doclava/Doclava.java
@@ -317,7 +317,7 @@
} else if (a[0].equals("-yaml")) {
yamlNavFile = a[1];
} else if (a[0].equals("-dac_libraryroot")) {
- libraryRoot = a[1];
+ libraryRoot = ensureSlash(a[1]);
mHDFData.add(new String[] {"library.root", a[1]});
} else if (a[0].equals("-dac_dataname")) {
mHDFData.add(new String[] {"dac_dataname", a[1]});