am e9a96dd: am 4e4c919: AI 148759: Add download page for NDK 1.5 r1.
Merge commit 'e9a96dd92c2577b77d3a5e5a0d04dfab6f4af5f2'
* commit 'e9a96dd92c2577b77d3a5e5a0d04dfab6f4af5f2':
AI 148759: Add download page for NDK 1.5 r1.
diff --git a/tools/droiddoc/templates-sdk/sdkpage.cs b/tools/droiddoc/templates-sdk/sdkpage.cs
index 4a933e9..8bf30d1 100644
--- a/tools/droiddoc/templates-sdk/sdkpage.cs
+++ b/tools/droiddoc/templates-sdk/sdkpage.cs
@@ -31,9 +31,13 @@
</div>
<div id="jd-content">
- <p><em>
- <?cs var:sdk.date ?>
- </em></p>
+ <p><em><?cs
+ if:ndk ?><?cs
+ var:ndk.date ?><?cs
+ else ?><?cs
+ var:sdk.date ?><?cs
+ /if ?></em>
+ </p>
<?cs if:sdk.not_latest_version ?>
<div class="special">
@@ -48,7 +52,62 @@
<p>The sections below provide an overview of the SDK package. </p>
<?cs else ?>
+ <?cs if:ndk ?>
+<p>The Android NDK is a companion tool to the Android SDK that lets Android
+application developers build performance-critical portions of their apps in
+native code. It is designed for use <em>only</em> in conjunction with the
+Android SDK, so if you have not already installed the Android 1.5 SDK, please do
+so before downloading the NDK. Also, please read <a href="">What is the Android
+NDK?</a> to get an understanding of what the NDK offers and whether it will be
+useful to you.</p>
+
+<p>Select the download package that is appropriate for your development
+computer. Note that separate download packages are provided for 32- and 64-bit
+Linux platforms.</p>
+
+ <table class="download">
+ <tr>
+ <th>Platform</th>
+ <th>Package</th>
+ <th>Size</th>
+ <th>MD5 Checksum</th>
+ </tr>
+ <tr>
+ <td>Windows</td>
+ <td>
+ <a href="http://dl.google.com/android/<?cs var:ndk.win_download ?>"><?cs var:ndk.win_download ?></a>
+ </td>
+ <td><?cs var:ndk.win_bytes ?> bytes</td>
+ <td><?cs var:ndk.win_checksum ?></td>
+ </tr>
+ <tr class="alt-color">
+ <td>Mac OS X (intel)</td>
+ <td>
+ <a href="http://dl.google.com/android/<?cs var:ndk.mac_download ?>"><?cs var:ndk.mac_download ?></a>
+ </td>
+ <td><?cs var:ndk.mac_bytes ?> bytes</td>
+ <td><?cs var:ndk.mac_checksum ?></td>
+ </tr>
+ <tr>
+ <td>Linux 32-bit (i386)</td>
+ <td>
+ <a href="http://dl.google.com/android/<?cs var:ndk.linux_download ?>"><?cs var:ndk.linux_download ?></a>
+ </td>
+ <td><?cs var:ndk.linux_bytes ?> bytes</td>
+ <td><?cs var:ndk.linux_checksum ?></td>
+ </tr>
+ <tr class="alt-color">
+ <td>Linux 64-bit (x86_64)</td>
+ <td>
+ <a href="http://dl.google.com/android/<?cs var:ndk.linux_64_download ?>"><?cs var:ndk.linux_64_download ?></a>
+ </td>
+ <td><?cs var:ndk.linux_64_bytes ?> bytes</td>
+ <td><?cs var:ndk.linux_64_checksum ?></td>
+ </tr>
+ </table>
+
+ <?cs else ?>
<p>Before downloading, please read the <a href="requirements.html">
System Requirements</a> 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. </p>
@@ -87,6 +146,7 @@
</table>
<?cs /if ?>
+<?cs /if ?>
<?cs call:tag_list(root.descr) ?>
diff --git a/tools/droiddoc/templates/assets/android-developer-docs.css b/tools/droiddoc/templates/assets/android-developer-docs.css
index a12e6d9..b463cb6 100644
--- a/tools/droiddoc/templates/assets/android-developer-docs.css
+++ b/tools/droiddoc/templates/assets/android-developer-docs.css
@@ -590,6 +590,10 @@
p.warning {
border-color: #aa0033;
}
+
+p.caution {
+ border-color: #ffcf00;
+}
p.warning b, p.warning strong {
font-weight: bold;
