summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2016-05-11 17:07:40 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-05-11 17:07:40 +0000
commitd66400ca9fefe6d53efee422a1e291cd958b60ec (patch)
treea934326ff1c301064e019c815d444c5559b26efe
parentb27d8853d91b1b1a451f363fdca71a65f2cd7431 (diff)
parent530db560f7b7737ac86c0892a095f3fc00462259 (diff)
downloadplatform_external_doclava-d66400ca9fefe6d53efee422a1e291cd958b60ec.tar.gz
platform_external_doclava-d66400ca9fefe6d53efee422a1e291cd958b60ec.tar.bz2
platform_external_doclava-d66400ca9fefe6d53efee422a1e291cd958b60ec.zip
Enable navtree for devsite builds. Custom hdf vars for reference extensions lists files. am: 796181bb34 am: 44a503aec8 am: 167eea4837
am: 530db560f7 * commit '530db560f7b7737ac86c0892a095f3fc00462259': Enable navtree for devsite builds. Custom hdf vars for reference extensions lists files. Change-Id: I2c3b8f457ea500d1d48092536114113f406daf82
-rw-r--r--src/com/google/doclava/Doclava.java6
-rw-r--r--src/com/google/doclava/NavTree.java8
2 files changed, 11 insertions, 3 deletions
diff --git a/src/com/google/doclava/Doclava.java b/src/com/google/doclava/Doclava.java
index 01f1c70..c1d29ee 100644
--- a/src/com/google/doclava/Doclava.java
+++ b/src/com/google/doclava/Doclava.java
@@ -393,9 +393,7 @@ public class Doclava {
} else if(gcmRef){
refPrefix = "gcm-";
}
- if (!USE_DEVSITE_LOCALE_OUTPUT_PATHS) {
- NavTree.writeNavTree(javadocDir, refPrefix);
- }
+ NavTree.writeNavTree(javadocDir, refPrefix);
// Write yaml tree.
if (yamlNavFile != null){
@@ -947,8 +945,10 @@ public class Doclava {
if (USE_DEVSITE_LOCALE_OUTPUT_PATHS) {
if (testSupportRef) {
listDir = listDir + testSupportPath;
+ data.setValue("reference.testSupport", "true");
} else if (wearableSupportRef) {
listDir = listDir + wearableSupportPath;
+ data.setValue("reference.wearableSupport", "true");
}
}
for (String s : sorted.keySet()) {
diff --git a/src/com/google/doclava/NavTree.java b/src/com/google/doclava/NavTree.java
index 57d83d4..7b08740 100644
--- a/src/com/google/doclava/NavTree.java
+++ b/src/com/google/doclava/NavTree.java
@@ -49,6 +49,14 @@ public class NavTree {
ClearPage.write(data, "gms_navtree_data.cs", "gms_navtree_data.js");
} else if (refPrefix == "gcm-"){
ClearPage.write(data, "gcm_navtree_data.cs", "gcm_navtree_data.js");
+ } else if ((Doclava.USE_DEVSITE_LOCALE_OUTPUT_PATHS)
+ && (Doclava.testSupportRef)){
+ ClearPage.write(data, "navtree_data.cs", dir + Doclava.testSupportPath
+ + "navtree_data.js");
+ } else if ((Doclava.USE_DEVSITE_LOCALE_OUTPUT_PATHS)
+ && (Doclava.wearableSupportRef)){
+ ClearPage.write(data, "navtree_data.cs", dir + Doclava.wearableSupportPath
+ + "navtree_data.js");
} else {
ClearPage.write(data, "navtree_data.cs", "navtree_data.js");
}