diff options
author | Frank Gevaerts <frank@gevaerts.be> | 2017-09-06 18:26:07 +0200 |
---|---|---|
committer | Frank Gevaerts <frank@gevaerts.be> | 2017-09-06 18:26:31 +0200 |
commit | 1d58667c1ff430bd7aba1417b702d68544fb8c13 (patch) | |
tree | ac19bd4f51fd0c706389134587bcfea425b49937 | |
parent | 4580897d055943dd31923a152a4b2d7f87649472 (diff) | |
download | rockbox-1d58667c1ff430bd7aba1417b702d68544fb8c13.tar.gz rockbox-1d58667c1ff430bd7aba1417b702d68544fb8c13.zip |
Make android build work with both old and new locations of zipalign
Change-Id: I56438c55debc60cb5e1a118ce0123f0c837258cd
-rw-r--r-- | android/android.make | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/android/android.make b/android/android.make index 6f7cb8a41a..b36943b673 100644 --- a/android/android.make +++ b/android/android.make | |||
@@ -35,7 +35,11 @@ ANDROID_PLATFORM=$(ANDROID_SDK_PATH)/platforms/android-$(ANDROID_PLATFORM_VERSIO | |||
35 | BUILD_TOOLS_VERSION=$(notdir $(firstword $(wildcard $(ANDROID_SDK_PATH)/build-tools/$(ANDROID_PLATFORM_VERSION).*))) | 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 | ifneq ("$(wildcard $(ANDROID_SDK_PATH)/tools/zipalign)","") |
39 | ZIPALIGN=$(ANDROID_SDK_PATH)/tools/zipalign | ||
40 | else | ||
41 | ZIPALIGN=$(ANDROID_SDK_PATH)/build-tools/$(BUILD_TOOLS_VERSION)/zipalign | ||
42 | endif | ||
39 | KEYSTORE=$(HOME)/.android/debug.keystore | 43 | KEYSTORE=$(HOME)/.android/debug.keystore |
40 | ADB=$(ANDROID_SDK_PATH)/platform-tools/adb | 44 | ADB=$(ANDROID_SDK_PATH)/platform-tools/adb |
41 | BUILDAPK=$(ANDROID_DIR)/buildapk.sh | 45 | BUILDAPK=$(ANDROID_DIR)/buildapk.sh |