From 5523edec266586facc874e689aac2954bbbc662a Mon Sep 17 00:00:00 2001
From: Isaac Hutt <mhutti1@gmail.com>
Date: Sat, 18 Mar 2017 18:59:52 +0000
Subject: [PATCH] Fixed generation and install of custom apps

---
 gen-custom-android-build.py | 12 +++++++++++-
 install-kiwix-on-device.sh  |  6 +++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/gen-custom-android-build.py b/gen-custom-android-build.py
index 9512e2412..b7573013b 100755
--- a/gen-custom-android-build.py
+++ b/gen-custom-android-build.py
@@ -490,6 +490,16 @@ def step_build_apk(jsdata, **options):
     syscall('./gradlew build --stacktrace')
 
 
+    # rename APKs for better listing
+    folder_name = os.path.split(ANDROID_PATH)[-1]
+    for variant in ('debug', 'release-unsigned'):
+        shutil.move(os.path.join('build', 'outputs', 'apk',
+                                 "{}-{}.apk".format(folder_name, variant)),
+                    os.path.join('build', 'outputs', 'apk',
+                                 "{}-{}.apk".format(jsdata.get('package'), variant)))
+
+
+
 def step_move_apk_to_destination(jsdata, **options):
     """ place and rename built APKs to main output directory """
 
@@ -501,7 +511,7 @@ def step_move_apk_to_destination(jsdata, **options):
     except OSError:
         pass
     # move generated APK to satisfy other scripts
-    for variant in ('debug', 'debug-unaligned', 'release-unsigned'):
+    for variant in ('debug', 'release-unsigned'):
         shutil.move(os.path.join(ANDROID_PATH, 'build', 'outputs', 'apk',
                                  "{}-{}.apk"
                                  .format(jsdata.get('package'), variant)),
diff --git a/install-kiwix-on-device.sh b/install-kiwix-on-device.sh
index 3e7907282..29d2b1e60 100755
--- a/install-kiwix-on-device.sh
+++ b/install-kiwix-on-device.sh
@@ -8,12 +8,12 @@ if [ "x$1" != "x" ];
 	PACKAGE=$1
 fi
 
-if [ -f build/outputs/apk/${PACKAGE}-debug-unaligned.apk ]
+if [ -f build/outputs/apk/${PACKAGE}-debug.apk ]
 then
     echo "Uninstalling old Kiwix APK..."
-    ../src/dependencies/android-sdk/platform-tools/adb uninstall ${PACKAGE} ;
+    ${ANDROID_HOME}/platform-tools/adb uninstall ${PACKAGE} ;
     echo "Installing new Kiwix APK..."
-    ../src/dependencies/android-sdk/platform-tools/adb install build/outputs/apk/${PACKAGE}-debug-unaligned.apk
+    ${ANDROID_HOME}/platform-tools/adb install build/outputs/apk/${PACKAGE}-debug.apk
 else
     echo "No APK file available for package ${PACKAGE} !"
 fi