diff options
| author | Scott Main <smain@google.com> | 2013-02-04 16:43:16 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-04 16:43:16 -0800 |
| commit | 1f199b97065cba3e5d10f09859b7934c47b455ed (patch) | |
| tree | 49d0b7e30f123cfb92f71efc2b114611ab1a76e5 | |
| parent | 516d61296d86e0b49edbde3bc72a8c434c44079e (diff) | |
| parent | 460dd2aa33a4e4666eb05f7a26f335e2a012dbb7 (diff) | |
| download | android_external_doclava-1f199b97065cba3e5d10f09859b7934c47b455ed.tar.gz android_external_doclava-1f199b97065cba3e5d10f09859b7934c47b455ed.tar.bz2 android_external_doclava-1f199b97065cba3e5d10f09859b7934c47b455ed.zip | |
am 460dd2aa: remove condition for devsite and use the timestamp js for all doc builds
# Via Scott Main
* commit '460dd2aa33a4e4666eb05f7a26f335e2a012dbb7':
remove condition for devsite and use the timestamp js for all doc builds
| -rw-r--r-- | src/com/google/doclava/ClearPage.java | 2 | ||||
| -rw-r--r-- | src/com/google/doclava/Doclava.java | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/com/google/doclava/ClearPage.java b/src/com/google/doclava/ClearPage.java index 0df647d..cd7e5ea 100644 --- a/src/com/google/doclava/ClearPage.java +++ b/src/com/google/doclava/ClearPage.java @@ -176,7 +176,7 @@ public class ClearPage { System.err.println(from.getAbsolutePath() + ": Error opening file"); return; } - if ((Doclava.devsite) && (!isValidContentType(toPath, DROIDDOC_VALID_CONTENT_TYPES))) { + if (!isValidContentType(toPath, DROIDDOC_VALID_CONTENT_TYPES)) { Errors.error(Errors.INVALID_CONTENT_TYPE, null, "Failed to process " + from + ": Invalid file type. Please move the file to frameworks/base/docs/image_sources/... or docs/downloads/..."); return; diff --git a/src/com/google/doclava/Doclava.java b/src/com/google/doclava/Doclava.java index a93f5b9..4435018 100644 --- a/src/com/google/doclava/Doclava.java +++ b/src/com/google/doclava/Doclava.java @@ -69,7 +69,6 @@ public class Doclava { public static ArrayList<String> inputPathHtmlDir2 = new ArrayList<String>(); public static String outputPathHtmlDirs; public static String outputPathHtmlDir2; - public static boolean devsite = false; public static final String devsiteRoot = "en/"; public static String javadocDir = "reference/"; public static String htmlExtension; @@ -247,7 +246,6 @@ public class Doclava { } else if (a[0].equals("-yaml")) { yamlNavFile = a[1]; } else if (a[0].equals("-devsite")) { - devsite = true; // Don't copy the doclava assets to devsite output (ie use proj assets only) includeDefaultAssets = false; outputPathHtmlDirs = outputPathHtmlDirs + "/" + devsiteRoot; @@ -786,10 +784,8 @@ public class Doclava { } // Create the timestamp.js file based on .cs file - if (devsite) { - Data timedata = Doclava.makeHDF(); - ClearPage.write(timedata, "timestamp.cs", "timestamp.js"); - } + Data timedata = Doclava.makeHDF(); + ClearPage.write(timedata, "timestamp.cs", "timestamp.js"); } public static void writeLists() { |