From 0e459796346ca98684a115302f448a6317799372 Mon Sep 17 00:00:00 2001
From: Marcus Comstedt
Date: Wed, 18 Jun 2014 21:40:13 +0200
Subject: ANDROID: Allow build with non-ancient SDK

---
 backends/platform/android/android.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'backends')

diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index 7c4fe01d54..1a40299dcd 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -48,10 +48,10 @@ PLUGIN_RESOURCES = \
 #LDFLAGS += -Wl,--gc-sections
 #CXXFLAGS += -ffunction-sections -fdata-sections -fvisibility=hidden -fvisibility-inlines-hidden
 
-AAPT = $(ANDROID_SDK)/platform-tools/aapt
+AAPT = $(ANDROID_SDK)/$(ANDROID_BTOOLS)/aapt
 ADB = $(ANDROID_SDK)/platform-tools/adb
-DX = $(ANDROID_SDK)/platform-tools/dx
-APKBUILDER = $(ANDROID_SDK)/tools/apkbuilder
+DX = $(ANDROID_SDK)/$(ANDROID_BTOOLS)/dx
+APKBUILDER = java -Xmx128M -classpath $(ANDROID_SDK)/tools/lib/sdklib.jar com.android.sdklib.build.ApkBuilderMain
 JAVAC ?= javac
 JAVACFLAGS = -source 1.5 -target 1.5
 
-- 
cgit v1.2.3