From 911e311e4e7571c667664e261252778ebc898749 Mon Sep 17 00:00:00 2001 From: Dirk Dougherty <> Date: Mon, 20 Apr 2009 17:56:31 -0700 Subject: [PATCH] AI 147058: am: CL 147054 am: CL 147053 Add -hdf primer vars for the platform and release ID associated with the current (most recent) SDK. Currently, the docs that are specific to each SDK release -- downloading, installing, upgrading, requirements -- are stored in a directory with release-derived name, such as "1.1_r1". This change lets documents use generic links to point into the most recent version specific docs, eg href="{@docRoot}sdk/{sdkCurrent}/installing.html" instead of href="{@docRoot}sdk/1.1_r1/installing.html". Original author: ddougherty Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 147058 --- tools/droiddoc/src/Comment.java | 1 + tools/droiddoc/templates-sdk/customization.cs | 8 ++++---- tools/droiddoc/templates-sdk/sdkpage.cs | 8 ++++---- tools/droiddoc/templates/macros.cs | 3 +++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/tools/droiddoc/src/Comment.java b/tools/droiddoc/src/Comment.java index 3a24357f6..3f1bf6c50 100644 --- a/tools/droiddoc/src/Comment.java +++ b/tools/droiddoc/src/Comment.java @@ -47,6 +47,7 @@ public class Comment "@deprecated", "@undeprecate", "@docRoot", + "@sdkCurrent", "@inheritDoc", "@more", "@code", diff --git a/tools/droiddoc/templates-sdk/customization.cs b/tools/droiddoc/templates-sdk/customization.cs index 4a1dde6fe..384e43f09 100644 --- a/tools/droiddoc/templates-sdk/customization.cs +++ b/tools/droiddoc/templates-sdk/customization.cs @@ -19,7 +19,7 @@ def:custom_masthead() ?> if:android.whichdoc != "online" ?>offline.htmlindex.html"> Home -
Before downloading, please read the
+ Before downloading, please read the
System Requirements document. As you start the download, you will also need to review and agree to
the Terms and Conditions that govern the use of the Android SDK.