[Scummvm-git-logs] scummvm branch-2-2 -> ec703bd4de31144afef24333e5f45a936536f7d5

[antoniou79]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ec703bd4de ANDROID: use gradle's auto-align and set debuggable to false for release builds


Commit: ec703bd4de31144afef24333e5f45a936536f7d5
    https://github.com/scummvm/scummvm/commit/ec703bd4de31144afef24333e5f45a936536f7d5
Author: antoniou (a.antoniou79 at gmail.com)
Date: 2020-10-18T12:58:44+03:00

Commit Message:
ANDROID: use gradle's auto-align and set debuggable to false for release builds

There were issues with manually aligning apks possibly  due to upgrading gradle

The manual zipalign even though running with no fail message, would NOT align the apk properly anymore.
Command to manual verify alignment of an apk is:
Android/Sdk/tools/bin/zipalign -c -v 4 release/ScummVM-release-unsigned.apk

Changed paths:
    backends/platform/android/android.mk
    dists/android/build.gradle


diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index fed9aba212..341004d19f 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -37,11 +37,11 @@ $(PATH_BUILD_LIBSCUMMVM): libscummvm.so | $(PATH_BUILD)
 
 $(APK_MAIN): $(PATH_BUILD_GRADLE) $(PATH_BUILD_ASSETS) $(PATH_BUILD_LIBSCUMMVM) | $(PATH_BUILD)
 	(cd $(PATH_BUILD); ./gradlew assembleDebug)
-	$(CP) $(PATH_BUILD)/build/outputs/apk/debug/ScummVM-debug.apk $@
+	$(CP) $(PATH_BUILD)/build/outputs/apk/debug/$(APK_MAIN) $@
 
 $(APK_MAIN_RELEASE): $(PATH_BUILD_GRADLE) $(PATH_BUILD_ASSETS) $(PATH_BUILD_LIBSCUMMVM) | $(PATH_BUILD)
-	(cd $(PATH_BUILD); ./gradlew build)
-	$(CP) $(PATH_BUILD)/build/outputs/apk/release/ScummVM-release-unsigned.apk $@
+	(cd $(PATH_BUILD); ./gradlew assembleRelease)
+	$(CP) $(PATH_BUILD)/build/outputs/apk/release/$(APK_MAIN_RELEASE) $@
 
 all: $(APK_MAIN)
 
diff --git a/dists/android/build.gradle b/dists/android/build.gradle
index 2bd4ebc45f..07cf598acc 100644
--- a/dists/android/build.gradle
+++ b/dists/android/build.gradle
@@ -54,8 +54,14 @@ android {
 
     }
     buildTypes {
+	debug{
+            debuggable true
+        }
         release {
+            debuggable false
             minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            zipAlignEnabled true
         }
     }
     sourceSets {