From b104bec238731842ece4e236d0336218a63b8b75 Mon Sep 17 00:00:00 2001
From: Ykkrosh <philip@wildfiregames.com>
Date: Sat, 25 Feb 2012 16:11:08 +0000
Subject: [PATCH] Fix Android build scripts.

This was SVN commit r11153.
---
 build/android/sdl-project/AndroidManifest.xml | 1 +
 build/android/sdl-project/Makefile            | 2 +-
 build/android/setup-libs.sh                   | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build/android/sdl-project/AndroidManifest.xml b/build/android/sdl-project/AndroidManifest.xml
index 37f182ae96..e65b61bc3c 100644
--- a/build/android/sdl-project/AndroidManifest.xml
+++ b/build/android/sdl-project/AndroidManifest.xml
@@ -4,6 +4,7 @@
       android:versionCode="1"
       android:versionName="1.0">
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
     <uses-feature android:glEsVersion="0x00020000" android:required="true"/>
     <uses-sdk android:targetSdkVersion="10" android:minSdkVersion="10"/>
     <application android:label="@string/app_name"
diff --git a/build/android/sdl-project/Makefile b/build/android/sdl-project/Makefile
index 798cb218dd..3bf26a826b 100644
--- a/build/android/sdl-project/Makefile
+++ b/build/android/sdl-project/Makefile
@@ -1,5 +1,5 @@
 ANDROID=${HOME}/android
-NDK=${ANDROID}/android-ndk-r7-crystax-4
+NDK=${ANDROID}/android-ndk-r7-crystax-5.beta2
 SDK=${ANDROID}/android-sdk-linux
 TOOLCHAIN=${ANDROID}/toolchain-0ad
 SYSROOT=${TOOLCHAIN}/sysroot
diff --git a/build/android/setup-libs.sh b/build/android/setup-libs.sh
index 7200dfeccc..8c46cf9079 100755
--- a/build/android/setup-libs.sh
+++ b/build/android/setup-libs.sh
@@ -4,7 +4,7 @@ set -e
 set -o nounset
 
 ANDROID=$HOME/android
-NDK=$ANDROID/android-ndk-r7-crystax-4
+NDK=$ANDROID/android-ndk-r7-crystax-5.beta2
 SDK=$ANDROID/android-sdk-linux
 TOOLCHAIN=$ANDROID/toolchain-0ad
 
@@ -106,9 +106,9 @@ if [ "$build_curl" = "true" ]; then
 fi
 
 if [ "$build_libpng" = "true" ]; then
-  rm -rf temp/libpng-1.5.7
-  tar xvf files/libpng-1.5.7.tar.xz -C temp/
-  pushd temp/libpng-1.5.7
+  rm -rf temp/libpng-1.5.8
+  tar xvf files/libpng-1.5.8.tar.xz -C temp/
+  pushd temp/libpng-1.5.8
   ./configure --host=arm-linux-eabi --with-sysroot=$SYSROOT --prefix=$SYSROOT/usr/local CFLAGS="$CFLAGS"
   make $JOBS
   make install