OS X versioning dance.

[perl5.git] / README.android

diff --git a/README.android b/README.android
index 1c4fa83..b774d9f 100644 (file)
--- a/README.android
+++ b/README.android
@@ -18,7 +18,7 @@ perl native using one of the toolchains available on the Play Store.
 This document describes how to set up your host environment when
 attempting to build Perl for Android.
 
-=head1 Cross-Compiling Perl
+=head1 Cross-compilation
 
 These instructions assume an Unixish build environment on your host system;
 they've been tested on Linux and OS X, and may work on Cygwin and MSYS.
@@ -26,6 +26,12 @@ While Google also provides an NDK for Windows, these steps won't work
 native there, although it may be possible to cross-compile through different
 means.
 
+If your host system's architecture is 32 bits, remember to change the
+C<x86_64>'s below to C<x86>'s.  On a similar vein, the examples below
+use the 4.8 toolchain; if you want to use something older or newer (for
+example, the 4.4.3 toolchain included in the 8th revision of the NDK), just
+change those to the relevant version.
+
 =head2 Get the Android Native Development Kit (NDK)
 
 You can download the NDK from L<https://developer.android.com/tools/sdk/ndk/index.html>.
@@ -39,7 +45,7 @@ As of 2014, most Android devices run on ARM, so that is generally a safe bet.
 
 With those two in hand, you should add
 
-$ANDROID_NDK/toolchains/$TARGETARCH-4.4.3/prebuilt/`uname | tr '[A-Z]' '[a-z]'`-x86_64/bin
+$ANDROID_NDK/toolchains/$TARGETARCH-4.8/prebuilt/`uname | tr '[A-Z]' '[a-z]'`-x86_64/bin
 
 to your PATH, where $ANDROID_NDK is the location where you unpacked the
 NDK, and $TARGETARCH is your target's architecture.
@@ -54,7 +60,7 @@ This creates a working sysroot that we can feed to Configure later.
             --platform=android-9 \
             --install-dir=$ANDROID_TOOLCHAIN \
             --system=`uname | tr '[A-Z]' '[a-z]'`-x86_64 \
-            --toolchain=$TARGETARCH-4.4.3
+            --toolchain=$TARGETARCH-4.8
 
 =head2 adb or ssh?
 
@@ -68,7 +74,7 @@ in general, if you can connect your device to the host using a USB port,
 or if you don't feel like installing an sshd app on your device,
 you may want to use adb, although you may be forced to switch to ssh if
 your device is not rooted and you're unlucky -- more on that later.
-Alternatively, if you're cross-compiling for an emulator, you'll have to
+Alternatively, if you're cross-compiling to an emulator, you'll have to
 use adb.
 
 =head3 adb
@@ -111,7 +117,7 @@ device.  Either try rooting it, or go for the ssh route.
 
 To use ssh, you'll need to install and run a sshd app and set it up
 properly.  There are several paid and free apps that do this rather
-easily, so you should be able to spot one easily.
+easily, so you should be able to spot one on the store.
 Remember that Perl requires a passwordless connection, so set up a 
 public key.
 
@@ -167,6 +173,8 @@ On some older low-end devices -- think early 2.2 era -- some tests,
 particularly t/re/uniprops, may crash the phone, causing it to turn
 itself off once, and then back on again.
 
+=back
+
 =head1 Native Builds
 
 While Google doesn't provide a native toolchain for Android,
@@ -182,11 +190,9 @@ in.  For example, CCTools installs its toolchain in
 /data/data/com.pdaxrom.cctools/root/cctools.  With the path in hand,
 compiling perl is little more than:
 
-    export SYSROOT=<location of the native toolchain>
-    export LD_LIBRARY_PATH="$SYSROOT/lib:`pwd`:`pwd`/lib:`pwd`/lib/auto:$LD_LIBRARY_PATH"
-    sh Configure -des -Dsysroot=$SYSROOT -Alibpth="/system/lib /vendor/lib"
-
-=back
+ export SYSROOT=<location of the native toolchain>
+ export LD_LIBRARY_PATH="$SYSROOT/lib:`pwd`:`pwd`/lib:`pwd`/lib/auto:$LD_LIBRARY_PATH"
+ sh Configure -des -Dsysroot=$SYSROOT -Alibpth="/system/lib /vendor/lib"
 
 =head1 AUTHOR