From 9a61f4b56a15254c857c5c4361fdd8820b650e10 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Tue, 4 Jan 2011 21:05:42 -0800
Subject: [PATCH] Backed down to NDK R4b

---
 Makefile.android                   | 10 ++++++++--
 android/project/default.properties |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Makefile.android b/Makefile.android
index 2291944a6..6666b9101 100755
--- a/Makefile.android
+++ b/Makefile.android
@@ -2,8 +2,14 @@
 
 include ./android/config.cfg #get ANDROID_NDK, ANDROID_NDK_HOST
 
-TOOLS_PATH=$(ANDROID_NDK)/toolchains/arm-eabi-4.4.0/prebuilt/$(ANDROID_NDK_HOST)/bin
-ANDROID_INCLUDES = -I$(ANDROID_NDK)/platforms/android-4/arch-arm/usr/include 
+# For NDK R4
+TOOLS_PATH=$(ANDROID_NDK)/build/prebuilt/$(ANDROID_NDK_HOST)/arm-eabi-4.2.1/bin
+ANDROID_INCLUDES = -I$(ANDROID_NDK)/build/platforms/android-4/arch-arm/usr/include 
+
+# For NDK R5
+#TOOLS_PATH=$(ANDROID_NDK)/toolchains/arm-eabi-4.4.0/prebuilt/$(ANDROID_NDK_HOST)/bin
+#ANDROID_INCLUDES = -I$(ANDROID_NDK)/platforms/android-4/arch-arm/usr/include 
+
 INCLUDE = -I./include
 CFLAGS  = -g -O2 -fno-short-enums $(INCLUDE) $(ANDROID_INCLUDES) -DANDROID -DANDROID_NDK -static
 
diff --git a/android/project/default.properties b/android/project/default.properties
index 9d135cb85..9d79b12c7 100644
--- a/android/project/default.properties
+++ b/android/project/default.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-7
+target=android-4