[Scummvm-git-logs] scummvm master -> e09b4e9e999ecaf411641dc1d5bf61fa70b20a14

[antoniou79]

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

Summary:
d3c72b4c97 ANDROID: Update files in build directory when source changed
4367c2d350 ANDROID: Don't target Android API level 29 yet
e09b4e9e99 ANDROID: Make compilation settings more flexible


Commit: d3c72b4c971409ac38e90532b7af49b2386f90bf
    https://github.com/scummvm/scummvm/commit/d3c72b4c971409ac38e90532b7af49b2386f90bf
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2020-04-07T11:36:02+03:00

Commit Message:
ANDROID: Update files in build directory when source changed

Changed paths:
    backends/platform/android/android.mk


diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index cbe96f4852..c9131c7f5b 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -4,6 +4,8 @@ PATH_DIST = $(srcdir)/dists/android
 
 PORT_DISTFILES = $(PATH_DIST)/README.Android
 
+GRADLE_FILES = $(shell find $(PATH_DIST)/gradle -type f) $(PATH_DIST)/gradlew $(PATH_DIST)/build.gradle
+
 PATH_BUILD = ./android_project
 PATH_BUILD_GRADLE = $(PATH_BUILD)/build.gradle
 PATH_BUILD_ASSETS = $(PATH_BUILD)/assets
@@ -15,7 +17,7 @@ APK_MAIN_RELEASE = ScummVM-release-unsigned.apk
 $(PATH_BUILD):
 	$(MKDIR) $(PATH_BUILD)
 
-$(PATH_BUILD_GRADLE): $(PATH_BUILD)
+$(PATH_BUILD_GRADLE): $(GRADLE_FILES) | $(PATH_BUILD)
 	$(CP) -r $(PATH_DIST)/gradle/ $(PATH_BUILD)
 	$(INSTALL) -c -m 755 $(PATH_DIST)/gradlew $(PATH_BUILD)
 	$(INSTALL) -c -m 644 $(PATH_DIST)/build.gradle $(PATH_BUILD)
@@ -74,4 +76,4 @@ androiddistrelease: androidrelease
 		sed 's/$$/\r/' < $$i > release/`basename $$i`.txt; \
 	done
 
-.PHONY: androidrelease androidtest $(PATH_BUILD_SRC)
\ No newline at end of file
+.PHONY: androidrelease androidtest $(PATH_BUILD_SRC)


Commit: 4367c2d350334d963cc5df8108c803e752a833ec
    https://github.com/scummvm/scummvm/commit/4367c2d350334d963cc5df8108c803e752a833ec
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2020-04-07T11:36:02+03:00

Commit Message:
ANDROID: Don't target Android API level 29 yet

Android API level 29 introduces scoped storage which is enabled by
default for applications targeting level 29.
This protection prevents us to access external storage.
There is a compatibility flag but it will disappear in Android 11.
To target more recent platforms, we should implement SAF FS backend.

Changed paths:
    dists/android/build.gradle


diff --git a/dists/android/build.gradle b/dists/android/build.gradle
index 2e0ef5e26a..29ccef4eea 100644
--- a/dists/android/build.gradle
+++ b/dists/android/build.gradle
@@ -33,7 +33,7 @@ android {
         setProperty("archivesBaseName", "ScummVM")
 
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 28
 
         versionName "2.2.0git"
         versionCode 45


Commit: e09b4e9e999ecaf411641dc1d5bf61fa70b20a14
    https://github.com/scummvm/scummvm/commit/e09b4e9e999ecaf411641dc1d5bf61fa70b20a14
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2020-04-07T11:36:02+03:00

Commit Message:
ANDROID: Make compilation settings more flexible

- Don't expect compilation to be run on a Linux host
- Allow override of CXX and STRINGS by environment variables

This should not break already working build systems

Changed paths:
    configure


diff --git a/configure b/configure
index 7d7096dc51..cc14dddf96 100755
--- a/configure
+++ b/configure
@@ -1966,31 +1966,45 @@ esac
 
 # Toolchain for Android is in NDK and is using different naming convention
 if test "$_host_os" = android; then
-	case $_host_cpu in
-	arm)
-		_android_target="armv7a-linux-androideabi16"
-		;;
-	aarch64)
-		# Platform version 21 is needed as earlier versions of platform do not support this architecture.
-		_android_target="aarch64-linux-android21"
-		;;
-	i686)
-		_android_target="i686-linux-android16"
-		;;
-	x86_64)
-		# Platform version 21 is needed as earlier versions of platform do not support this architecture.
-		_android_target="x86_64-linux-android21"
-		;;
-	esac
+	# Try to use a known to work (on linux) toolchain
+	_android_toolchain="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64"
+	if test -n "$ANDROID_TOOLCHAIN"; then
+		_android_toolchain="$ANDROID_TOOLCHAIN"
+	fi
+
+	# If CXX environment variable is not set, try to set known to work defaults
+	if test -z "$CXX"; then
+		case $_host_cpu in
+		arm)
+			_android_target="armv7a-linux-androideabi16"
+			;;
+		aarch64)
+			# Platform version 21 is needed as earlier versions of platform do not support this architecture.
+			_android_target="aarch64-linux-android21"
+			;;
+		i686)
+			_android_target="i686-linux-android16"
+			;;
+		x86_64)
+			# Platform version 21 is needed as earlier versions of platform do not support this architecture.
+			_android_target="x86_64-linux-android21"
+			;;
+		esac
 
-	CXX="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++"
-	append_var CXXFLAGS "-target $_android_target"
-	append_var LDFLAGS "-target $_android_target"
+		CXX="$_android_toolchain/bin/clang++"
+		# If CXX is defined don't alter CXXFLAGS and LDFLAGS as the user can do it himself
+		append_var CXXFLAGS "-target ${_android_target}"
+		append_var LDFLAGS "-target ${_android_target}"
+	fi
 
-	_ar="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/$_ar"
-	_as="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/$_as"
-	_ranlib="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/$_ranlib"
-	_strip="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/$_strip"
+	# These values can get overriden below by environments variables
+	_ar="$_android_toolchain/bin/$_ar"
+	_as="$_android_toolchain/bin/$_as"
+	_ranlib="$_android_toolchain/bin/$_ranlib"
+	_strip="$_android_toolchain/bin/$_strip"
+	if test -z "$STRINGS"; then
+		STRINGS="$_android_toolchain/bin/$_host_alias-strings"
+	fi
 fi
 
 #