AAPT=$(SDK)/platform-tools/aapt
APKBUILDER=$(SDK)/tools/apkbuilder
ZIPALIGN_A=$(SDK)/tools/zipalign
-ZIPALIGN_B=$(SDK)/build-tools/*/zipalign
+ZIPALIGN_B=$(shell ls $(SDK)/build-tools/*/zipalign | tail -1)
JAVA_SRC_DIR=src/org/altusmetrum/AltosDroid
EXT_LIBDIR=libs
SUPPORT_V4=$(EXT_LIBDIR)/$(SUPPORT_V4_JAR)
-GOOGLE_PLAY_SERVICES_LIB_SRCDIR=$(SDK)/extras/google/google_play_services/libproject
+GOOGLE_PLAY_SERVICES_LIB_SRCDIR=$(SDK)/..
GOOGLE_PLAY_SERVICES_LIB=google-play-services_lib
JAVA_SRC=$(JAVA_SRC_DIR)/*.java $(JAVA_SRC_DIR)/BuildInfo.java
$(ADB) install -r bin/AltosDroid-debug.apk
bin/AltosDroid-debug.apk: $(SRC) $(ALTOSLIB) $(SUPPORT_V4) $(GOOGLE_PLAY_SERVICES_LIB)
- ant debug
+ JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 ant debug
bin/AltosDroid-release-unsigned.apk: $(SRC) $(ALTOSLIB) $(SUPPORT_V4) $(GOOGLE_PLAY_SERVICES_LIB)
- ant release
+ JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 ant release
bin/AltosDroid-release.apk: bin/AltosDroid-release-unsigned.apk
jarsigner -sigalg SHA1withDSA -digestalg SHA1 \