X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2FMakefile.am;h=dd875cab1525b93bcb1ea28962725c6542e22df6;hb=3c4d4d5cc1a8361a713aba075b29c3f6509f3f90;hp=295abbc57347ca611fafe3b5890020b03fe2392e;hpb=204ae5142702044eb8ad2697a55028e904067958;p=fw%2Faltos

diff --git a/altosdroid/Makefile.am b/altosdroid/Makefile.am
index 295abbc5..dd875cab 100644
--- a/altosdroid/Makefile.am
+++ b/altosdroid/Makefile.am
@@ -15,7 +15,7 @@ ADB=$(SDK)/platform-tools/adb
 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
@@ -34,7 +34,7 @@ SUPPORT_V4_JAR=android-support-v4.jar
 
 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
@@ -83,10 +83,10 @@ install-debug: bin/AltosDroid-debug.apk
 	$(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 \