-
Missed call |
diff --git a/docs/html/index.jd b/docs/html/index.jd
index 07d0abe7f6e46..cd55b2196189c 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -13,8 +13,10 @@ home=true
-
Google I/O is a two-day developer event that will take place May 27-28 at Moscone Center, San Francisco. The agenda includes a number of great sessions on Android topics by team engineers and other developers.
-
Learn more »
+
The Google I/O developer conference took place May 27-28 in San Francisco.
+ If you missed the conference, you can experience the Android sessions
+ by viewing YouTube videos and presentation slides.
+
See the Mobile sessions at Google I/O »
diff --git a/docs/html/sdk/1.5_r2/installing.jd b/docs/html/sdk/1.5_r2/installing.jd
index 69b2c1bef5335..1530dc56e1db5 100644
--- a/docs/html/sdk/1.5_r2/installing.jd
+++ b/docs/html/sdk/1.5_r2/installing.jd
@@ -9,7 +9,7 @@ page.title=Installing the Android SDK
This page describes how to install the Android SDK and set up your
development environment. If you haven't downloaded the SDK, you can
do so from the
-Download page. Once you've downloaded
+Download page. Once you've downloaded
the SDK, return here.
If you encounter any problems during installation, see the
@@ -19,7 +19,7 @@ this page.
Upgrading?
If you have already developed applications using an earlier version
of the SDK, please read
-Upgrading the
+Upgrading the
SDK, instead.
@@ -27,7 +27,7 @@ SDK, instead.
Preparing for Installation
Before you begin, take a moment to confirm that your development machine meets the
-System Requirements.
+System Requirements.
If you will be developing on Eclipse with the Android Development
@@ -323,7 +323,7 @@ begin developing applications. Here are a few ways you can get started:
- If JDK is already installed on your development computer, please
take a moment to make sure that it meets the version requirements listed
- in the System Requirements.
+ in the System Requirements.
In particular, note that some Linux distributions may include JDK 1.4 or Gnu
Compiler for Java, both of which are not supported for Android development.
diff --git a/docs/html/sdk/ndk/1.5-r1/index.jd b/docs/html/sdk/ndk/1.5_r1/index.jd
similarity index 82%
rename from docs/html/sdk/ndk/1.5-r1/index.jd
rename to docs/html/sdk/ndk/1.5_r1/index.jd
index 3d3137c51dfdc..7ccbbcd4f5ba5 100644
--- a/docs/html/sdk/ndk/1.5-r1/index.jd
+++ b/docs/html/sdk/ndk/1.5_r1/index.jd
@@ -1,32 +1,35 @@
ndk=true
ndk.version=1.5
ndk.rel.id=1
-ndk.date=May 2009
+ndk.date=June 2009
ndk.win_download=android-ndk-1.5_r1-windows.zip
-ndk.win_bytes=22450814
-ndk.win_checksum=7b7836f705ec7e66225794edda34000f
+ndk.win_bytes=22500667
+ndk.win_checksum=e5c53915903d8b81f3e2ea422e2e2717
ndk.mac_download=android-ndk-1.5_r1-darwin-x86.zip
-ndk.mac_bytes=17165450
-ndk.mac_checksum=214ccfd704c0307609fbabeb7bf86acc
+ndk.mac_bytes=17215303
+ndk.mac_checksum=1931f0e182798a4c98924fd87380b5b8
ndk.linux_download=android-ndk-1.5_r1-linux-x86.zip
-ndk.linux_bytes=15976032
-ndk.linux_checksum=808fd4d6a7e45f76d546ba04ab9ef060
-
-ndk.linux_64_download=android-ndk-1.5_r1-linux-x86_64.zip
-ndk.linux_64_bytes=18112300
-ndk.linux_64_checksum=f8664c187b3ae077bcfe2b44294d0758
+ndk.linux_bytes=16025885
+ndk.linux_checksum=80a4e14704ca84c21bf1824cb25fbd8b
page.title=Android 1.5 NDK, Release 1
@jd:body
-What is the NDK?
+What is the Android NDK?
-The Android 1.5 NDK provides tools that allow Android application developers
-to embed and deploy native code within their Android applications. It
-provides:
+The Android NDK provides tools that allow Android application developers
+to embed components that make use of native code in their Android applications.
+
+
+Android applications run in the Dalvik virtual machine. The NDK allows
+developers to implement parts of their applications using native-code languages
+such as C and C++. This can provide benefits to certain classes of applications,
+in the form of reuse of existing code and in some cases increased speed.
+
+The NDK provides:
- A set of tools and build files used to generate native code libraries from C
@@ -35,18 +38,21 @@ and C++ sources
files (.apks) that can be deployed on Android devices
- A set of native system headers and libraries that will be supported in all
future versions of the Android platform, starting from Android 1.5
+- Documentation, samples, and tutorials
-This release of the NDK release supports the ARMv5TE machine instruction set
-and provides stable headers for libc (the C library), libm (the Math library)
-and the JNI interface.
+This release of the NDK supports the ARMv5TE machine instruction set
+and provides stable headers for libc (the C library), libm (the Math library),
+the JNI interface, and other libraries.
-Using the NDK may not be relevant for all Android applications. As a
-developer, you will need to balance its benefits (faster execution) and its
-drawbacks (no portability, JNI overhead, no access to system libraries, and
-difficult debugging). Typical good candidates for the NDK are CPU-intensive
-operations that don't allocate too much memory, such as signal processing,
-physics simulation, custom bytecode/instruction interpreters, and so on.
+The NDK will not benefit most applications. As a developer, you will need
+to balance its benefits against its drawbacks; notably, using native code does
+not result in an automatic performance increase, but does always increase
+application complexity. Typical good candidates for the NDK are self-contained,
+CPU-intensive operations that don't allocate much memory, such as signal processing,
+physics simulation, and so on. Simply re-coding a method to run in C usually does
+not result in a large performance increase. The NDK can, however, can be
+an effective way to reuse a large corpus of existing C/C++ code.
Please note that the NDK does not enable you to develop native-only
applications. Android's primary runtime remains the Dalvik virtual machine.
@@ -64,8 +70,11 @@ guaranteed to be supported in all later releases of the platform:
- libc (C library) headers
-- libm (Math library) headers
+- libm (math library) headers
- JNI interface headers
+- libz (Zlib compression) headers
+- liblog (Android logging) header
+- A Minimal set of headers for C++ support
The NDK also provides a build system that lets you work efficiently with your
@@ -97,6 +106,22 @@ usage
defines the native sources you want to compile
APPLICATION-MK.TXT — describes the use of the Application.mk file,
which describes the native sources required by your Android application
+HOWTO.TXT — information about common tasks associated with NDK
+development.
+SYSTEM-ISSUES.TXT — known issues in the Android system images
+that you should be aware of, if you are developing using the NDK.
+STABLE-APIS.TXT — a complete list of the stable APIs exposed
+by headers in the NDK.
+
+
+Additionally, the package includes detailed information about the "bionic"
+C library provided with the Android platform that you should be aware of, if you
+are developing using the NDK. You can find the documentation in the
+<ndk>/docs/system/libc/ directory:
+
+
+- OVERVIEW.TXT — provides an overview of the "bionic" C library and the
+features it offers.
Sample applications
@@ -142,13 +167,14 @@ required.
For all development platforms, GNU Make 3.81 or later is required. Earlier
versions of GNU Make might work but have not been tested.
For Windows, a recent release of Cygwin is required.
+href="http://www.cygwin.com">Cygwin, including both the gmake and gcc
+packages, is required.
Android platform compatibility
- The native libraries created by the Android NDK can only be used on
-devices running the Android 1.5 platform version or later. This is due to subtle
+devices running the Android 1.5 platform version or later. This is due to
toolchain and ABI related changes that make the native libraries incompatible
with 1.0 and 1.1 system images.
- For this reason, you should use native libraries produced with the NDK in
diff --git a/docs/html/sdk/sdk_toc.cs b/docs/html/sdk/sdk_toc.cs
index 2079dd8a62f36..ce1ee6e084ab1 100644
--- a/docs/html/sdk/sdk_toc.cs
+++ b/docs/html/sdk/sdk_toc.cs
@@ -26,6 +26,12 @@
- Android 1.1 Version Notes
+
+ Native Development Tools
+
+
Previous SDK Releases