From be9c22727059fda1be7db6254d17660679c277f4 Mon Sep 17 00:00:00 2001
From: Frank Gevaerts <frank@gevaerts.be>
Date: Thu, 25 Sep 2014 00:24:38 +0200
Subject: Don't require a specific BUILD_TOOLS_VERSION.

Pick anything with the correct major version, which should be good enough.

Currently we want sdk version 19, which has tools that come as 19.0.3 or
19.1.0, depending on when exactly the sdk was installed. Both work fine
for rockbox, so accepting both is useful.

Change-Id: Ie31306210e3cfe78288269574e78976b682eab31
---
 android/android.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'android')

diff --git a/android/android.make b/android/android.make
index 0b6a32a9df..6f7cb8a41a 100644
--- a/android/android.make
+++ b/android/android.make
@@ -32,7 +32,7 @@ ANDROID_PLATFORM_VERSION=19
 ANDROID_PLATFORM=$(ANDROID_SDK_PATH)/platforms/android-$(ANDROID_PLATFORM_VERSION)
 
 # android tools
-BUILD_TOOLS_VERSION=19.1.0
+BUILD_TOOLS_VERSION=$(notdir $(firstword $(wildcard $(ANDROID_SDK_PATH)/build-tools/$(ANDROID_PLATFORM_VERSION).*)))
 AAPT=$(ANDROID_SDK_PATH)/build-tools/$(BUILD_TOOLS_VERSION)/aapt
 DX=$(ANDROID_SDK_PATH)/build-tools/$(BUILD_TOOLS_VERSION)/dx
 ZIPALIGN=$(ANDROID_SDK_PATH)/tools/zipalign
-- 
cgit v1.2.3