diff options
| author | Frank Gevaerts <frank@gevaerts.be> | 2014-09-25 00:24:38 +0200 |
|---|---|---|
| committer | Frank Gevaerts <frank@gevaerts.be> | 2014-09-25 00:26:25 +0200 |
| commit | be9c22727059fda1be7db6254d17660679c277f4 (patch) | |
| tree | 5b827b53ba4be50082260bc5d631475ed148fc17 | |
| parent | 428641998e7173120fc864c78c5dde7851496d8b (diff) | |
| download | rockbox-be9c22727059fda1be7db6254d17660679c277f4.tar.gz 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.make | 2 |
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 | |||
| 32 | ANDROID_PLATFORM=$(ANDROID_SDK_PATH)/platforms/android-$(ANDROID_PLATFORM_VERSION) | 32 | ANDROID_PLATFORM=$(ANDROID_SDK_PATH)/platforms/android-$(ANDROID_PLATFORM_VERSION) |
| 33 | 33 | ||
| 34 | # android tools | 34 | # android tools |
| 35 | BUILD_TOOLS_VERSION=19.1.0 | 35 | BUILD_TOOLS_VERSION=$(notdir $(firstword $(wildcard $(ANDROID_SDK_PATH)/build-tools/$(ANDROID_PLATFORM_VERSION).*))) |
| 36 | AAPT=$(ANDROID_SDK_PATH)/build-tools/$(BUILD_TOOLS_VERSION)/aapt | 36 | AAPT=$(ANDROID_SDK_PATH)/build-tools/$(BUILD_TOOLS_VERSION)/aapt |
| 37 | DX=$(ANDROID_SDK_PATH)/build-tools/$(BUILD_TOOLS_VERSION)/dx | 37 | DX=$(ANDROID_SDK_PATH)/build-tools/$(BUILD_TOOLS_VERSION)/dx |
| 38 | ZIPALIGN=$(ANDROID_SDK_PATH)/tools/zipalign | 38 | ZIPALIGN=$(ANDROID_SDK_PATH)/tools/zipalign |