summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2014-09-25 00:24:38 +0200
committerFrank Gevaerts <frank@gevaerts.be>2014-09-25 00:26:25 +0200
commitbe9c22727059fda1be7db6254d17660679c277f4 (patch)
tree5b827b53ba4be50082260bc5d631475ed148fc17
parent428641998e7173120fc864c78c5dde7851496d8b (diff)
downloadrockbox-be9c22727059fda1be7db6254d17660679c277f4.tar.gz
rockbox-be9c22727059fda1be7db6254d17660679c277f4.tar.bz2
rockbox-be9c22727059fda1be7db6254d17660679c277f4.zip
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
-rw-r--r--android/android.make2
1 files changed, 1 insertions, 1 deletions
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