gradle dont show the name of the apk in its output. So in release mode, check first the non signed version. gradle build use env, not args.keystore

tito · tito · commit 421657dcc2b5 · 2017-05-24T13:04:11.000+02:00
diff --git a/pythonforandroid/toolchain.py b/pythonforandroid/toolchain.py
@@ -797,16 +797,20 @@ def apk(self, args):
 
         if not apk_file:
             info_main('# APK filename not found in build output, trying to guess')
-            suffix = args.build_mode
-            if suffix == 'release' and not args.keystore:
-                suffix = suffix + '-unsigned'
-            apks = glob.glob(join(apk_dir, apk_glob.format(suffix)))
-            if len(apks) == 0:
+            if args.build_mode == "release":
+                suffixes = ("release", "release-unsigned")
+            else:
+                suffixes = ("debug", )
+            for suffix in suffixes:
+                apks = glob.glob(join(apk_dir, apk_glob.format(suffix)))
+                if apks:
+                    if len(apks) > 1:
+                        info('More than one built APK found... guessing you '
+                             'just built {}'.format(apks[-1]))
+                    apk_file = apks[-1]
+                    break
+            else:
                 raise ValueError('Couldn\'t find the built APK')
-            if len(apks) > 1:
-                info('More than one built APK found... guessing you '
-                     'just built {}'.format(apks[-1]))
-            apk_file = apks[-1]
 
         info_main('# Found APK file: {}'.format(apk_file))
         if apk_add_version:
