[Scummvm-git-logs] scummvm master -> 1c268859006156c0ce810c2b297b6dc082914da0
sev-
sev at scummvm.org
Fri Jan 26 13:51:45 CET 2018
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:
210ad851b7 ANDROIDSDL: set version name to 2.1.0git, renamed asset appdata file
3d4b6c721d ANDROIDSDL: added patch for adding parameter android:sharedUserId in AndroidManifest.xml
83737a77ec ANDROIDSDL: fixed path to output apk file in build.sh script
773f6a8a95 ANDROIDSDL: removed armeabi target, because support of armeabi removed from master branch of pelya(s) libSDL
425061f442 ANDROIDSDL: updated How_to_build instruction. Pelya(s) libSDL changed build scripts from ant to gradle so ant not needed
aa56b7fca9 ANDROIDSDL: updated how_to_build instructions. Latest NDK r16b not supported by pelya(s) libSDL, supported ndk version i
1c26885900 ANDROIDSDL: updated build script, added git checkout to one of previous branch in libSDL, because in master branch of pe
Commit: 210ad851b7f8c80c03063758ae7fa9d680083ab1
https://github.com/scummvm/scummvm/commit/210ad851b7f8c80c03063758ae7fa9d680083ab1
Author: lubomyr (lubomyr31 at gmail.com)
Date: 2018-01-26T13:51:38+01:00
Commit Message:
ANDROIDSDL: set version name to 2.1.0git, renamed asset appdata file
Changed paths:
backends/platform/androidsdl/androidsdl.mk
dists/androidsdl/scummvm/AndroidAppSettings.cfg
dists/androidsdl/scummvm/AndroidAppSettings.cfg.in
diff --git a/backends/platform/androidsdl/androidsdl.mk b/backends/platform/androidsdl/androidsdl.mk
index 53c0d27..cf6ab6a 100644
--- a/backends/platform/androidsdl/androidsdl.mk
+++ b/backends/platform/androidsdl/androidsdl.mk
@@ -4,8 +4,8 @@ androidsdl:
$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) release
$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) release
$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip release
- zip -j scummvm_1_10_0-git-appdata.zip release/*
- split -d -b 1000000 scummvm_1_10_0-git-appdata.zip scummvm_1_10_0-git-appdata.zip0
- $(RM) -r scummvm_1_10_0-git-appdata.zip
+ zip -j scummvm_2_1_0-git-appdata.zip release/*
+ split -d -b 1000000 scummvm_2_1_0-git-appdata.zip scummvm_2_1_0-git-appdata.zip0
+ $(RM) -r scummvm_2_1_0-git-appdata.zip
.PHONY: androidsdl
diff --git a/dists/androidsdl/scummvm/AndroidAppSettings.cfg b/dists/androidsdl/scummvm/AndroidAppSettings.cfg
index ec0bf64..d99474d 100644
--- a/dists/androidsdl/scummvm/AndroidAppSettings.cfg
+++ b/dists/androidsdl/scummvm/AndroidAppSettings.cfg
@@ -23,7 +23,7 @@ InhibitSuspend=y
# If the URL does not contain 'http://' it is treated as file from 'project/jni/application/src/AndroidData' dir -
# these files are put inside .apk package by build system
# Also please avoid 'https://' URLs, many Android devices do not have trust certificates and will fail to connect to SF.net over HTTPS
-AppDataDownloadUrl="!!App data|scummvm_1_10_0-git-appdata.zip"
+AppDataDownloadUrl="!!App data|scummvm_2_1_0-git-appdata.zip"
# Video color depth - 16 BPP is the fastest and supported for all modes, 24 bpp is supported only
# with SwVideoMode=y, SDL_OPENGL mode supports everything. (16)/(24)/(32)
@@ -174,7 +174,7 @@ AppMinimumRAM=256
AppVersionCode=20
# Application user-visible version name (string)
-AppVersionName="1.10.0git"
+AppVersionName="2.1.0git"
# Reset SDL config when updating application to the new version (y) / (n)
ResetSdlConfigForThisVersion=y
diff --git a/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in b/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in
index e978628..c0d1045 100644
--- a/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in
+++ b/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in
@@ -23,7 +23,7 @@ InhibitSuspend=y
# If the URL does not contain 'http://' it is treated as file from 'project/jni/application/src/AndroidData' dir -
# these files are put inside .apk package by build system
# Also please avoid 'https://' URLs, many Android devices do not have trust certificates and will fail to connect to SF.net over HTTPS
-AppDataDownloadUrl="!!App data|scummvm_1_10_0-git-appdata.zip"
+AppDataDownloadUrl="!!App data|scummvm_2_1_0-git-appdata.zip"
# Video color depth - 16 BPP is the fastest and supported for all modes, 24 bpp is supported only
# with SwVideoMode=y, SDL_OPENGL mode supports everything. (16)/(24)/(32)
Commit: 3d4b6c721d5737c40a41712d7003c30e202ec3e0
https://github.com/scummvm/scummvm/commit/3d4b6c721d5737c40a41712d7003c30e202ec3e0
Author: lubomyr (lubomyr31 at gmail.com)
Date: 2018-01-26T13:51:38+01:00
Commit Message:
ANDROIDSDL: added patch for adding parameter android:sharedUserId in AndroidManifest.xml
Changed paths:
A dists/androidsdl/scummvm/project.patch
diff --git a/dists/androidsdl/scummvm/project.patch b/dists/androidsdl/scummvm/project.patch
new file mode 100644
index 0000000..f777541
--- /dev/null
+++ b/dists/androidsdl/scummvm/project.patch
@@ -0,0 +1,8 @@
+--- a/project/AndroidManifest.xml 2018-01-01 17:35:08.893995813 +0200
++++ a/project/AndroidManifest.xml 2018-01-01 17:35:41.888969151 +0200
+@@ -6,4 +6,5 @@
+ android:installLocation="auto"
++ android:sharedUserId="org.scummvm.scummvm"
+ >
+ <application android:label="@string/app_name"
+ android:icon="@drawable/icon"
Commit: 83737a77ecc8b1033d04e919ef806f9236f9c939
https://github.com/scummvm/scummvm/commit/83737a77ecc8b1033d04e919ef806f9236f9c939
Author: lubomyr (lubomyr31 at gmail.com)
Date: 2018-01-26T13:51:38+01:00
Commit Message:
ANDROIDSDL: fixed path to output apk file in build.sh script
Changed paths:
dists/androidsdl/build.sh
diff --git a/dists/androidsdl/build.sh b/dists/androidsdl/build.sh
index 055278f..d46f761 100755
--- a/dists/androidsdl/build.sh
+++ b/dists/androidsdl/build.sh
@@ -22,5 +22,5 @@ fi
cd ../../../androidsdl
./build.sh scummvm
-mv project/bin/MainActivity-debug.apk ../scummvm/dists/androidsdl/scummvm-debug.apk
+mv project/app/build/outputs/apk/app-release.apk ../scummvm/dists/androidsdl/scummvm-debug.apk
cd ../scummvm/dists/androidsdl
Commit: 773f6a8a95434c6516cb64a7fa6a07c3e1e6e952
https://github.com/scummvm/scummvm/commit/773f6a8a95434c6516cb64a7fa6a07c3e1e6e952
Author: lubomyr (lubomyr31 at gmail.com)
Date: 2018-01-26T13:51:38+01:00
Commit Message:
ANDROIDSDL: removed armeabi target, because support of armeabi removed from master branch of pelya(s) libSDL
Changed paths:
dists/androidsdl/scummvm/AndroidAppSettings.cfg
dists/androidsdl/scummvm/AndroidAppSettings.cfg.in
diff --git a/dists/androidsdl/scummvm/AndroidAppSettings.cfg b/dists/androidsdl/scummvm/AndroidAppSettings.cfg
index d99474d..3442712 100644
--- a/dists/androidsdl/scummvm/AndroidAppSettings.cfg
+++ b/dists/androidsdl/scummvm/AndroidAppSettings.cfg
@@ -165,7 +165,7 @@ FirstStartMenuOptions=''
# Enable multi-ABI binary, with hardware FPU support - it will also work on old devices,
# but .apk size is 2x bigger (y) / (n) / (x86) / (all)
-MultiABI="armeabi armeabi-v7a arm64-v8a x86 x86_64"
+MultiABI="armeabi-v7a arm64-v8a x86 x86_64"
# Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower
AppMinimumRAM=256
diff --git a/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in b/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in
index c0d1045..0b6b6c6 100644
--- a/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in
+++ b/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in
@@ -165,7 +165,7 @@ FirstStartMenuOptions=''
# Enable multi-ABI binary, with hardware FPU support - it will also work on old devices,
# but .apk size is 2x bigger (y) / (n) / (x86) / (all)
-MultiABI="armeabi armeabi-v7a arm64-v8a x86 x86_64"
+MultiABI="armeabi-v7a arm64-v8a x86 x86_64"
# Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower
AppMinimumRAM=256
Commit: 425061f442520a0214aec1066c5092717b9ec18c
https://github.com/scummvm/scummvm/commit/425061f442520a0214aec1066c5092717b9ec18c
Author: lubomyr (lubomyr31 at gmail.com)
Date: 2018-01-26T13:51:38+01:00
Commit Message:
ANDROIDSDL: updated How_to_build instruction. Pelya(s) libSDL changed build scripts from ant to gradle so ant not needed anymore
Changed paths:
dists/androidsdl/How_to_Build.txt
diff --git a/dists/androidsdl/How_to_Build.txt b/dists/androidsdl/How_to_Build.txt
index 948cbd3..16c4858 100644
--- a/dists/androidsdl/How_to_Build.txt
+++ b/dists/androidsdl/How_to_Build.txt
@@ -36,7 +36,6 @@ Script:
5) Install packages, which needs for build:
Commands:
- sudo apt-get install ant //If you install manually - set envirnoment value to Ant
sudo apt-get install make
sudo apt-get install git-core
Commit: aa56b7fca915e618e74a0155d9a9ed46561693cb
https://github.com/scummvm/scummvm/commit/aa56b7fca915e618e74a0155d9a9ed46561693cb
Author: lubomyr (lubomyr31 at gmail.com)
Date: 2018-01-26T13:51:38+01:00
Commit Message:
ANDROIDSDL: updated how_to_build instructions. Latest NDK r16b not supported by pelya(s) libSDL, supported ndk version is r15c
Changed paths:
dists/androidsdl/How_to_Build.txt
diff --git a/dists/androidsdl/How_to_Build.txt b/dists/androidsdl/How_to_Build.txt
index 16c4858..0e5afb1 100644
--- a/dists/androidsdl/How_to_Build.txt
+++ b/dists/androidsdl/How_to_Build.txt
@@ -1,10 +1,12 @@
1) At first, for building you need (64bit) linux.
-2) Install Android SDK and NDK (You can unpack them into ~/android directory), and download required tools.
+2) Install Android SDK and NDK (You can unpack them into ~/Android directory), and download required tools.
- https://developer.android.com/ndk/downloads/index.html
https://developer.android.com/studio/index.html (you can download GUI Android Studio with SDK (which installs
from studio) or download command-line tools)
+
+At current moment (01.01.2018) latest NDK version r16b not supported by pelya's liBSDL, so you need to use previous version r15c
+ https://developer.android.com/ndk/downloads/older_releases.html
Download this:
@@ -29,9 +31,8 @@ Script:
#!/bin/sh
export ANDROID_HOME=~/Android/android-sdk
- export ANDROID_NDK_HOME=~/Android/Sdk/ndk-bundle
- export PATH=$ANDROID_NDK_HOME:$ANDROID_HOME/tools:$PATH
- export PATH=$ANDROID_HOME/build-tools/25.0.2:$PATH
+ export ANDROID_NDK_HOME=~/Android/android-ndk-r15c
+ export PATH=$ANDROID_NDK_HOME:$ANDROID_HOME/tools:$PATH
5) Install packages, which needs for build:
Commit: 1c268859006156c0ce810c2b297b6dc082914da0
https://github.com/scummvm/scummvm/commit/1c268859006156c0ce810c2b297b6dc082914da0
Author: lubomyr (lubomyr31 at gmail.com)
Date: 2018-01-26T13:51:38+01:00
Commit Message:
ANDROIDSDL: updated build script, added git checkout to one of previous branch in libSDL, because in master branch of pelya(s) libSDL broken built-in virtual keyboard. I hope it will be fixed soon.
Changed paths:
dists/androidsdl/build.sh
diff --git a/dists/androidsdl/build.sh b/dists/androidsdl/build.sh
index d46f761..ec65e2a 100755
--- a/dists/androidsdl/build.sh
+++ b/dists/androidsdl/build.sh
@@ -8,6 +8,7 @@ if [ \! -d ../../../androidsdl ] ; then
git clone git://github.com/pelya/commandergenius androidsdl
cd androidsdl
git submodule update --init project/jni/iconv/src
+ git checkout d378ee692f2e380a0ab0635c1df2eb6941b5bf58
cd ../scummvm/dists/androidsdl
fi
More information about the Scummvm-git-logs
mailing list