len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 10:07:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make android build work with both old and new locations of zipalign

Browse source 
Change-Id: I56438c55debc60cb5e1a118ce0123f0c837258cd
This commit is contained in:
Frank Gevaerts 2017-09-06 18:26:07 +02:00
parent 4580897d05
commit 1d58667c1f
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
android/android.make
View file

@ -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