summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2017-09-06 18:26:07 +0200
committerFrank Gevaerts <frank@gevaerts.be>2017-09-06 18:26:31 +0200
commit1d58667c1ff430bd7aba1417b702d68544fb8c13 (patch)
treeac19bd4f51fd0c706389134587bcfea425b49937
parent4580897d055943dd31923a152a4b2d7f87649472 (diff)
downloadrockbox-1d58667c1ff430bd7aba1417b702d68544fb8c13.tar.gz
rockbox-1d58667c1ff430bd7aba1417b702d68544fb8c13.tar.bz2
rockbox-1d58667c1ff430bd7aba1417b702d68544fb8c13.zip
Make android build work with both old and new locations of zipalign
Change-Id: I56438c55debc60cb5e1a118ce0123f0c837258cd
-rw-r--r--android/android.make6
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
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
+ifneq ("$(wildcard $(ANDROID_SDK_PATH)/tools/zipalign)","")
+ ZIPALIGN=$(ANDROID_SDK_PATH)/tools/zipalign
+else
+ ZIPALIGN=$(ANDROID_SDK_PATH)/build-tools/$(BUILD_TOOLS_VERSION)/zipalign
+endif
KEYSTORE=$(HOME)/.android/debug.keystore
ADB=$(ANDROID_SDK_PATH)/platform-tools/adb
BUILDAPK=$(ANDROID_DIR)/buildapk.sh