From 1dab77178d13fd6f4d7f6bc0aac7c41f22cb7f51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Behmo?= <regis@behmo.com>
Date: Wed, 3 Oct 2018 15:43:21 +0200
Subject: [PATCH] Fix Android apk path

Close #70
---
 Makefile           | 4 ++--
 android/Dockerfile | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 5e7b1d3..0e96043 100644
--- a/Makefile
+++ b/Makefile
@@ -205,8 +205,8 @@ https-certificate-renew: ## Renew https certificates
 #################### Android application
 
 android: ## Build the Android app, for development
-	docker-compose -f docker-compose-android.yml run --rm android
-	@echo "Your APK file is ready: ./data/android/edx-prod-debuggable-2.14.0.apk"
+	@docker-compose -f docker-compose-android.yml run --rm android
+	@echo "Your APK file is ready: ./data/android/$(shell ls data/android/*.apk)"
 
 android-release: ## Build the final Android app (beta)
 	# Note that this requires that you edit ./config/android/gradle.properties
diff --git a/android/Dockerfile b/android/Dockerfile
index 0e25ef0..54c5a51 100644
--- a/android/Dockerfile
+++ b/android/Dockerfile
@@ -30,4 +30,4 @@ RUN ln -s /openedx/config/gradle.properties ./OpenEdXMobile/gradle.properties
 RUN yes | /openedx/android-sdk/tools/bin/sdkmanager --licenses
 
 CMD ./gradlew assembleProdDebuggable && \
-  cp OpenEdXMobile/build/outputs/apk/*.apk /openedx/data/
+  cp OpenEdXMobile/build/outputs/apk/prod/debuggable/*.apk /openedx/data/