am 0085f31: Update the NDK docs to reflect the changes from 2 download (

Merge commit '0085f310cd169bf9832f4b47751dc8ea406b1d58'

* commit '0085f310cd169bf9832f4b47751dc8ea406b1d58':
  Update the NDK docs to reflect the changes from 2 download (NDK+toolchain) to a single download.

ndk/build/host-setup.sh

@@ -76,7 +76,7 @@ add_config "HOST_ARFLAGS  := $ARFLAGS"
 TOOLCHAINS=arm-eabi-4.2.1
 
 EXT=""
-[[ "$OS" == "Windows_NT" ]] && EXT=".exe"
+[ "Windows_NT" -eq "$OS" ] && EXT=".exe"
 
 for tc in $TOOLCHAINS; do
     echo "Toolchain  : Checking for $tc prebuilt binaries"
@@ -85,10 +85,10 @@ for tc in $TOOLCHAINS; do
     if [ -z $COMPILERS ] ; then
         echo ""
         echo "ERROR:"
-        echo "It seems you do not have the prebuilt $tc toolchain binaries."
+        echo "It seems you do not have the correct $tc toolchain binaries."
         echo "Please go to the official Android NDK web site and download the"
-        echo "appropriate toolchain package for your platform ($HOST_TAG)."
+        echo "appropriate NDK package for your platform ($HOST_TAG)."
-        echo "See http://developer.android.com/ndk/1.5/index.html"
+        echo "See http://developer.android.com/sdk/index.html"
         echo ""
         echo "ABORTING."
         echo ""

ndk/docs/INSTALL.TXT

@@ -44,29 +44,14 @@ On Windows, you will need to install a recent release of Cygwin to use the NDK.
 See http://www.cygwin.com for instructions.
 
 
-II. Download prebuilt cross-toolchain binaries:
+II. Preparing your installation prebuilt cross-toolchain binaries:
 -----------------------------------------------
 
-Certain Android NDK packages do not include the host-specific binaries of the
+After installing and unarchiving the NDK, you will need to run the following
-cross-toolchain(s) required to build ARM binaries on Linux, OS X or Windows.
+command from the root folder:
 
-Check whether build/prebuilt/<system> exists and is populated, where <system>
+  build/host-setup.sh
-is one of the following:
 
-  linux-x86
+This will test your setup and make sure the NDK can work properly.
-  linux-x86_64
-  darwin-x86
-  windows
-
-If not, you might need to download a package named:
-
-  android-ndk-prebuilt-<system>-<date>.tar.bz2
-
-And unpack it in the top-level NDK directory. For example, on 32-bit Linux:
-
-  cd $NDK
-  tar xjf android-ndk-prebuilt-linux-x86-<date>.tar.bz2
-
-Please read docs/PREBUILTS.TXT to lean how to get the prebuilt packages.
 
 

ndk/docs/PREBUILTS.TXT

@@ -1,43 +0,0 @@
-The Android NDK relies on prebuilt platform-specific binaries of the
-GCC-based cross-toolchain(s) used to generate ARM binaries.
-
-At the moment, only one toolchain, named "arm-eabi-4.2.1" is supported,
-its sources being available in an archive named:
-
-   android-ndk-toolchain-<date>.tar.bz2
-
-XXX: Upload this to a public site like code.google.com/p/android
-     Note: this is over 100MB in size.
-
-Prebuilt versions of the toolchain binaries are available for a variety
-of supported platforms, and are generally named:
-
-   android-ndk-prebuilt-<date>-<system>.tar.bz2
-
-Where <system> can be one of the following:
-
-   linux-x86
-   linux-x86_64
-   darwin-x86
-   windows
-
-XXX: Upload these prebuilt packages to code.google.com/p/android or
-     another similar site. Note: each one is about 30MB in size.
-
-To install them, simply unpack them from the top-level NDK directory.
-For example, under 32-bit Linux:
-
-   cd $NDK
-   tar xjf android-ndk-prebuilt-20090323-linux-x86.tar.bz2
-
-Otherwise, it is possible to rebuild the toolchain from sources with the
-help of the 'build/tools/build-toolchain.sh' script. It can be used to
-generate a complete prebuilt package for other platforms.
-
-NOTE: The uncompressed toolchain sources are over 1 GB and make take
-      several hours to compile, depending on your machine.
-
-Note that, at the moment, the toolchain binaries are the only Android NDK
-files that are platform-specific. The rest being shell scripts and GNU
-Makefiles that should be portable to other Unix-like development
-environments.