[Scummvm-git-logs] scummvm branch-2-1 -> 4a48708beaabadf0cdf73fef89ae8f7c64c09bf4
antoniou79
antoniou at cti.gr
Sun Oct 6 20:22:13 CEST 2019
This automated email contains information about 7 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c2e661c867 CONFIGURE: Add clarification of possible target android hosts
e2f89dc02f CONFIGURE: Add android-mips64 in clarification for target hosts
e2ae874e6f ANDROID: Added info about historical release version codes
10c1b1f559 ANDROID: Bump the target SDK to match the Google Play release
0dc1f577b0 CONFIGURE: Add "-march=armv7-a" to linker for arm-v7a target
caaa4399cd ANDROID: Set target SDK to 26 to AndroidManifest.xml and project.properties files
4a48708bea ANDROID: Update starting version code for next release apks to 40
Commit: c2e661c867b2f7c7422069f9ac6f5966dfb0e4b7
https://github.com/scummvm/scummvm/commit/c2e661c867b2f7c7422069f9ac6f5966dfb0e4b7
Author: antoniou79 (stroggoff at gmail.com)
Date: 2019-10-06T21:17:48+03:00
Commit Message:
CONFIGURE: Add clarification of possible target android hosts
Changed paths:
configure
diff --git a/configure b/configure
index c5431ef..72b2a5e 100755
--- a/configure
+++ b/configure
@@ -968,9 +968,12 @@ Fine tuning of the installation directories:
Special configuration feature:
--host=HOST cross-compile to target HOST (arm-linux, ...)
special targets: 3ds for Nintendo 3DS
- android-arm for Android ARM
- android-mips for Android MIPS
+ android or android-arm for Android ARMv5TE (armeabi)
+ android-v7a or android-arm-v7a for Android ARMv7-A (armeabi-v7a)
+ android-arm64-v8a for Android ARMv8-A (arm64-v8a)
android-x86 for Android x86
+ android-x86_64 for Android x86_64
+ android-mips for Android MIPS
androidsdl for Android with SDL backend
caanoo for Caanoo
dingux for Dingux
Commit: e2f89dc02f265c671290e5cff693987564b19041
https://github.com/scummvm/scummvm/commit/e2f89dc02f265c671290e5cff693987564b19041
Author: antoniou79 (stroggoff at gmail.com)
Date: 2019-10-06T21:18:04+03:00
Commit Message:
CONFIGURE: Add android-mips64 in clarification for target hosts
Changed paths:
configure
diff --git a/configure b/configure
index 72b2a5e..6fba2ad 100755
--- a/configure
+++ b/configure
@@ -974,6 +974,7 @@ Special configuration feature:
android-x86 for Android x86
android-x86_64 for Android x86_64
android-mips for Android MIPS
+ android-mips64 for Android MIPS64
androidsdl for Android with SDL backend
caanoo for Caanoo
dingux for Dingux
Commit: e2ae874e6fbab44070266998f1556c3758b9951b
https://github.com/scummvm/scummvm/commit/e2ae874e6fbab44070266998f1556c3758b9951b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-10-06T21:19:35+03:00
Commit Message:
ANDROID: Added info about historical release version codes
Changed paths:
backends/platform/android/android.mk
diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index 42fc718..d4e3efe 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -1,7 +1,13 @@
# Android specific build targets
# These must be incremented for each market upload
-ANDROID_VERSIONCODE = 16
+ANDROID_VERSIONCODE = 35
+
+# Historical version codes:
+# Scummvm 2.0.0: 30-34
+# ScummVM 1.9.0.1: 25-28
+# ScummVM 1.9.0: 19
+# ScummVM 1.8.1: 15
ANDROID_TARGET_VERSION = 23
Commit: 10c1b1f55941c7f4f8b5aafea207f5e0db6d05d3
https://github.com/scummvm/scummvm/commit/10c1b1f55941c7f4f8b5aafea207f5e0db6d05d3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-10-06T21:19:57+03:00
Commit Message:
ANDROID: Bump the target SDK to match the Google Play release
Changed paths:
backends/platform/android/android.mk
diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index d4e3efe..c72058c 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -9,7 +9,7 @@ ANDROID_VERSIONCODE = 35
# ScummVM 1.9.0: 19
# ScummVM 1.8.1: 15
-ANDROID_TARGET_VERSION = 23
+ANDROID_TARGET_VERSION = 26
NDK_BUILD = $(ANDROID_NDK)/ndk-build APP_ABI=$(ABI)
SDK_ANDROID = $(ANDROID_SDK)/tools/android
Commit: 0dc1f577b02506d0f042631d9debf3656a02f2a8
https://github.com/scummvm/scummvm/commit/0dc1f577b02506d0f042631d9debf3656a02f2a8
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-10-06T21:20:28+03:00
Commit Message:
CONFIGURE: Add "-march=armv7-a" to linker for arm-v7a target
Based on https://developer.android.com/ndk/guides/standalone_toolchain
>From "ABI Compatibility" section:
Also, make sure to provide the following two flags to the linker: -march=armv7-a -Wl,--fix-cortex-a8
Changed paths:
configure
diff --git a/configure b/configure
index 6fba2ad..63132a8 100755
--- a/configure
+++ b/configure
@@ -2580,6 +2580,7 @@ case $_host_os in
append_var CXXFLAGS "-march=armv7-a"
append_var CXXFLAGS "-mfloat-abi=softfp"
append_var CXXFLAGS "-mfpu=vfp"
+ append_var LDFLAGS "-march=armv7-a"
append_var LDFLAGS "-Wl,--fix-cortex-a8"
ABI="armeabi-v7a"
;;
Commit: caaa4399cd6cdea3342299ffd301c20d679a75c3
https://github.com/scummvm/scummvm/commit/caaa4399cd6cdea3342299ffd301c20d679a75c3
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-10-06T21:20:46+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 6decf2c..e95df52 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
Commit: 4a48708beaabadf0cdf73fef89ae8f7c64c09bf4
https://github.com/scummvm/scummvm/commit/4a48708beaabadf0cdf73fef89ae8f7c64c09bf4
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-10-06T21:21:12+03:00
Commit Message:
ANDROID: Update starting version code for next release apks to 40
Changed paths:
backends/platform/android/android.mk
diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index 698fd75..8eee80b 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -1,17 +1,18 @@
# Android specific build targets
# These must be incremented for each market upload
-ANDROID_VERSIONCODE = 35
+ANDROID_VERSIONCODE = 40
# Historical version codes:
-# Scummvm 2.0.0: 30-34
+# ScummVM 2.1.0: 35-39 (armeabi, arm-v7a, arm64-v8a, x86, x86_64 respectively)
+# ScummVM 2.0.0: 30-34
# ScummVM 1.9.0.1: 25-28
# ScummVM 1.9.0: 19
# ScummVM 1.8.1: 15
ANDROID_TARGET_VERSION = 26
-# ndk-build will build the scummvm library in release mode by default unless:
+# 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)
More information about the Scummvm-git-logs
mailing list