X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2FMakefile.am;h=361de13cb3b917a44d2ece35ec733fdda91b1c06;hb=master;hp=3a4edde17044256d1833be3e85df8ccbc5a03d2e;hpb=3979c88417fd5512447f5d02cc660522dff5d9d6;p=fw%2Faltos

diff --git a/altosdroid/Makefile.am b/altosdroid/Makefile.am
index 3a4edde1..f9f69662 100644
--- a/altosdroid/Makefile.am
+++ b/altosdroid/Makefile.am
@@ -3,8 +3,10 @@ REL_APK=app/build/outputs/apk/release/app-release.apk
 
 if ANDROID
 all_target=$(DBG_APK)
+all_target += bin/AltosDroid-debug.apk
 if ANDROID_RELEASE
 all_target+=$(REL_APK)
+all_target += bin/AltosDroid-release.apk
 endif
 else
 all_target=
@@ -40,7 +42,7 @@ DRAWABLES=\
     $(DRAWABLE_DIR)/greenled.png \
     $(DRAWABLE_DIR)/grayled.png
 
-GRADLEW=bash ./gradlew --no-daemon
+GRADLEW=JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 bash ./gradlew --no-daemon
 
 LAYOUTS=$(LAYOUT_DIR)/*.xml
 MENUS=$(MENU_DIR)/*.xml
@@ -53,6 +55,14 @@ SRC=$(JAVA_SRC) $(DRAWABLES) $(RES)
 
 all: $(all_target)
 
+bin/AltosDroid-debug.apk: $(DBG_APK)
+	mkdir -p bin
+	cp $^ $@
+
+bin/AltosDroid-release.apk: $(REL_APK)
+	mkdir -p bin
+	cp $^ $@
+
 .NOTPARALLEL:
 
 $(ALTOSLIB): $(ALTOSLIB_SRCDIR)/$(ALTOSLIB_JAR)