diff options
| author | Rich Slogar <rslogar@google.com> | 2014-10-08 00:31:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-08 00:31:43 +0000 |
| commit | 6af8fc7f89cb5dec15c23ee04c271188ff11138d (patch) | |
| tree | 2f8c98a36582e97b11fd929df63d14bd94cb48ed | |
| parent | 8730092af798d27b9e9a9a4ba00cef0d3ebea55f (diff) | |
| parent | 1b0fba6478d15cb13de1472d3f421b36dc533907 (diff) | |
| download | frameworks_base-6af8fc7f89cb5dec15c23ee04c271188ff11138d.zip frameworks_base-6af8fc7f89cb5dec15c23ee04c271188ff11138d.tar.gz frameworks_base-6af8fc7f89cb5dec15c23ee04c271188ff11138d.tar.bz2 | |
Merge "docs:64 bit image and skd update" into klp-modular-docs
| -rw-r--r-- | docs/html/preview/setup-sdk.jd | 8 | ||||
| -rw-r--r-- | docs/html/tools/sdk/tools-notes.jd | 33 |
2 files changed, 40 insertions, 1 deletions
diff --git a/docs/html/preview/setup-sdk.jd b/docs/html/preview/setup-sdk.jd index af466ab..7ad881a 100644 --- a/docs/html/preview/setup-sdk.jd +++ b/docs/html/preview/setup-sdk.jd @@ -206,6 +206,12 @@ to flash the following devices: experimental 64-bit system images along with standard 32-bit system images. </p> +<p class="note"><strong>Note:</strong> The 64-bit system images require the +Intel x86 Emulator Accelerator (HAXM) Rev.5 which can be downloaded from the +<a href="{@docRoot}tools/help/sdk-manager.html">SDK Manager</a> <em>Extras</em> +folder.</p> + + <h3 id="installImage">Install the L Preview System Image</h3> <p class="warning"><b>Warning:</b> This is a preview version of the Android @@ -361,4 +367,4 @@ sure that you theme extends the material theme:</p> } }); -</script>
\ No newline at end of file +</script> diff --git a/docs/html/tools/sdk/tools-notes.jd b/docs/html/tools/sdk/tools-notes.jd index c2aaae8..b9803e4 100644 --- a/docs/html/tools/sdk/tools-notes.jd +++ b/docs/html/tools/sdk/tools-notes.jd @@ -25,9 +25,42 @@ Tools you are using, refer to the "Installed Packages" listing in the Android SD <p>For a summary of all known issues in SDK Tools, see <a href="http://tools.android.com/knownissues">http://tools.android.com/knownissues</a>.</p> + <div class="toggle-content opened"> <p><a href="#" onclick="return toggleContent(this)"> <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img" + alt=""/>SDK Tools, Revision 23.0.4</a> <em>(October 2014)</em> + </p> + + <div class="toggle-content-toggleme"> + + <dl> + <dt>Dependencies:</dt> + + <dd> + <ul> + <li>Android SDK Platform-tools revision 19 or later.</li> + <li>If you are developing in Eclipse with ADT, note that this version of SDK Tools is + designed for use with ADT 23.0.4 and later. If you haven't already, update your + <a href="{@docRoot}tools/sdk/eclipse-adt.html">ADT Plugin</a> to 23.0.4.</li> + <li>If you are developing outside Eclipse, you must have + <a href="http://ant.apache.org/">Apache Ant</a> 1.8 or later.</li> + </ul> + </dd> + + <dt>General Notes:</dt> + <dd> + <ul> + <li>Fixed duplicate devices in AVD for Wear and TV.</li> + </ul> + </dd> + </div> +</div> + + +<div class="toggle-content closed"> + <p><a href="#" onclick="return toggleContent(this)"> + <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img" alt=""/>SDK Tools, Revision 23.0.2</a> <em>(July 2014)</em> </p> |