[Scummvm-git-logs] scummvm master -> 9c422f5ce11f1f21da51aae4846336f8f98edc74

[antoniou79]

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

Summary:
bdf4ab5c06 ANDROID: Set a default path for PKG_CONFIG_LIBDIR
9c422f5ce1 ANDROID: Set the default path for curl-config


Commit: bdf4ab5c061a4f4a9e3e41a88788860849767b29
    https://github.com/scummvm/scummvm/commit/bdf4ab5c061a4f4a9e3e41a88788860849767b29
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-05-23T21:12:24+03:00

Commit Message:
ANDROID: Set a default path for PKG_CONFIG_LIBDIR

Changed paths:
    configure


diff --git a/configure b/configure
index a2ca0d4256..081f7307bd 100755
--- a/configure
+++ b/configure
@@ -1985,22 +1985,30 @@ if test "$_host_os" = android; then
 		_android_toolchain="$ANDROID_TOOLCHAIN"
 	fi
 
+	case $_host_cpu in
+	arm | i686)
+		_android_version=16
+		;;
+	aarch64 | x86_64)
+		# Platform version 21 is needed as earlier versions of platform do not support this architecture.
+		_android_version=21
+		;;
+	esac
+
 	# 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"
+			_android_target="armv7a-linux-androideabi$_android_version"
 			;;
 		aarch64)
-			# Platform version 21 is needed as earlier versions of platform do not support this architecture.
-			_android_target="aarch64-linux-android21"
+			_android_target="aarch64-linux-android$_android_version"
 			;;
 		i686)
-			_android_target="i686-linux-android16"
+			_android_target="i686-linux-android$_android_version"
 			;;
 		x86_64)
-			# Platform version 21 is needed as earlier versions of platform do not support this architecture.
-			_android_target="x86_64-linux-android21"
+			_android_target="x86_64-linux-android$_android_version"
 			;;
 		esac
 
@@ -2018,6 +2026,9 @@ if test "$_host_os" = android; then
 	if test -z "$STRINGS"; then
 		STRINGS="$_android_toolchain/bin/$_host_alias-strings"
 	fi
+	if test -z "$PKG_CONFIG_LIBDIR"; then
+		export PKG_CONFIG_LIBDIR="$_android_toolchain/sysroot/usr/lib/$_host_alias/$_android_version/pkgconfig"
+	fi
 fi
 
 #


Commit: 9c422f5ce11f1f21da51aae4846336f8f98edc74
    https://github.com/scummvm/scummvm/commit/9c422f5ce11f1f21da51aae4846336f8f98edc74
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-05-23T21:12:24+03:00

Commit Message:
ANDROID: Set the default path for curl-config

Changed paths:
    configure


diff --git a/configure b/configure
index 081f7307bd..6b7c6e44da 100755
--- a/configure
+++ b/configure
@@ -2029,6 +2029,7 @@ if test "$_host_os" = android; then
 	if test -z "$PKG_CONFIG_LIBDIR"; then
 		export PKG_CONFIG_LIBDIR="$_android_toolchain/sysroot/usr/lib/$_host_alias/$_android_version/pkgconfig"
 	fi
+	_libcurlpath="$_android_toolchain/sysroot/usr/bin/$_host_alias/$_android_version:$_libcurlpath"
 fi
 
 #