From 1d58667c1ff430bd7aba1417b702d68544fb8c13 Mon Sep 17 00:00:00 2001 From: Frank Gevaerts Date: Wed, 6 Sep 2017 18:26:07 +0200 Subject: Make android build work with both old and new locations of zipalign Change-Id: I56438c55debc60cb5e1a118ce0123f0c837258cd --- android/android.make | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3