[Scummvm-git-logs] scummvm master -> 30b789de39cb7c734597ac6eba1bdccd276b31f6

[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:
30b789de39 ANDROID: Set target SDK to 26 to AndroidManifest.xml and project.properties files


Commit: 30b789de39cb7c734597ac6eba1bdccd276b31f6
    https://github.com/scummvm/scummvm/commit/30b789de39cb7c734597ac6eba1bdccd276b31f6
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-10-05T23:57:35+03:00

Commit Message:
ANDROID: Set target SDK to 26 to AndroidManifest.xml and project.properties files

Changed paths:
    backends/platform/android/android.mk
    dists/android/AndroidManifest.xml
    dists/android/AndroidManifest.xml.in
    dists/android/project.properties


diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index c72058c..698fd75 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -11,6 +11,9 @@ ANDROID_VERSIONCODE = 35
 
 ANDROID_TARGET_VERSION = 26
 
+# ndk-build will build the scummvm library in release mode by default unless:
+# - an Application.mk is provided in the jni folder with APP_OPTIM := debug
+# - or AndroidManifest.xml declares android:debuggable within its <application> tag
 NDK_BUILD = $(ANDROID_NDK)/ndk-build APP_ABI=$(ABI)
 SDK_ANDROID = $(ANDROID_SDK)/tools/android
 
@@ -93,7 +96,7 @@ all: $(APK_MAIN)
 clean: androidclean
 
 androidclean:
-	@$(RM) -rf $(PATH_BUILD) *.apk release
+	@$(RM) -rf $(PATH_BUILD) *.apk release debug
 
 androidrelease: $(APK_MAIN_RELEASE)
 
@@ -115,4 +118,11 @@ androiddistdebug: all
 		sed 's/$$/\r/' < $$i > debug/`basename $$i`.txt; \
 	done
 
+androiddistrelease: androidrelease
+	$(MKDIR) release
+	$(CP) $(APK_MAIN_RELEASE) release/
+	for i in $(DIST_FILES_DOCS) $(PORT_DISTFILES); do \
+		sed 's/$$/\r/' < $$i > release/`basename $$i`.txt; \
+	done
+
 .PHONY: androidrelease androidtest $(PATH_BUILD_SRC)
diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml
index 0d32c4b..c74458b 100644
--- a/dists/android/AndroidManifest.xml
+++ b/dists/android/AndroidManifest.xml
@@ -8,7 +8,7 @@
 		android:sharedUserId="org.scummvm.scummvm">
 
 	<uses-sdk android:minSdkVersion="3"
-			android:targetSdkVersion="14"/>
+			android:targetSdkVersion="26"/>
 
 	<uses-permission
 			android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
diff --git a/dists/android/AndroidManifest.xml.in b/dists/android/AndroidManifest.xml.in
index 11a576e..fa1eafa 100644
--- a/dists/android/AndroidManifest.xml.in
+++ b/dists/android/AndroidManifest.xml.in
@@ -8,7 +8,7 @@
 		android:sharedUserId="org.scummvm.scummvm">
 
 	<uses-sdk android:minSdkVersion="3"
-			android:targetSdkVersion="14"/>
+			android:targetSdkVersion="26"/>
 
 	<uses-permission
 			android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
diff --git a/dists/android/project.properties b/dists/android/project.properties
index 730e911..3c0d189 100644
--- a/dists/android/project.properties
+++ b/dists/android/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-14
+target=android-26