[Scummvm-git-logs] scummvm master -> fdc6ab09f5889544efd83e6439bc77536fbed811
lephilousophe
noreply at scummvm.org
Tue Nov 12 21:44:03 UTC 2024
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
7bea121cb5 ANDROID: Also accept android-armeabi-v7a as host value
7ad5218e5a ANDROID: Add ability to build a fat bundle
195a80873f ANDROID: Adapt versionCode to fat bundles
12b35fb741 ANDROID: Update clean rule
83091c3f0f ANDROID: Cleanup PHONY targets
fdc6ab09f5 ANDROID: Make fat target more generic
Commit: 7bea121cb504c7d86349e1e3ea1556add4554eec
https://github.com/scummvm/scummvm/commit/7bea121cb504c7d86349e1e3ea1556add4554eec
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-11-12T22:43:57+01:00
Commit Message:
ANDROID: Also accept android-armeabi-v7a as host value
This matches the ABI name in Android.
Changed paths:
configure
diff --git a/configure b/configure
index 482269b992b..e7bc2ad48d7 100755
--- a/configure
+++ b/configure
@@ -1660,7 +1660,7 @@ case $_host in
datadir='${datarootdir}'
docdir='${prefix}/doc'
;;
-android-arm-v7a | ouya)
+android-arm-v7a | android-armeabi-v7a | ouya)
_host_os=android
_host_cpu=arm
_host_alias=arm-linux-androideabi
@@ -2839,7 +2839,7 @@ case $_host_os in
;;
android)
case $_host in
- android-arm-v7a)
+ android-arm-v7a | android-armeabi-v7a)
# Disable NEON for older devices (like with Tegra 2)
append_var CXXFLAGS "-mfpu=vfp"
# This is really old CPU but might be still used with android 4.1, it slightly increases code size and decreases performance.
@@ -3456,7 +3456,7 @@ if test -n "$_host"; then
_vorbis=no
_port_mk="backends/platform/3ds/3ds.mk"
;;
- android-arm-v7a | android-arm64-v8a | android-x86 | android-x86_64 | ouya)
+ android-* | ouya)
# __ANDROID__ is defined by Clang in the NDK
# we link a .so as default
append_var LDFLAGS "-shared"
Commit: 7ad5218e5a5545697cf3112d7717a6c353494ebe
https://github.com/scummvm/scummvm/commit/7ad5218e5a5545697cf3112d7717a6c353494ebe
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-11-12T22:43:57+01:00
Commit Message:
ANDROID: Add ability to build a fat bundle
This bundle contains all architectures.
To build it, a base architecture must be configured and the build
process will invoke the make process for all other architectures in
different subfolders.
Then, the bundle will be made with all libraries merged in the base
build directory.
Changed paths:
A backends/platform/android/fatbundle.mk
backends/platform/android/android.mk
diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index 8dbdc83a5b7..40f6028425a 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -85,8 +85,9 @@ all: $(APK_MAIN)
clean: androidclean
+# SUBPATH_BUILDS is set in fatbundle.mk
androidclean:
- @$(RM) -rf $(PATH_BUILD) *.apk
+ @$(RM) -rf $(PATH_BUILD) $(SUBPATH_BUILDS) *.apk
androidrelease: $(APK_MAIN_RELEASE)
androidbundlerelease: $(AAB_MAIN_RELEASE)
@@ -119,3 +120,5 @@ androiddistrelease: androidrelease
done
.PHONY: androidrelease androidbundlerelease androidtest $(PATH_BUILD_SRC)
+
+include $(srcdir)/backends/platform/android/fatbundle.mk
diff --git a/backends/platform/android/fatbundle.mk b/backends/platform/android/fatbundle.mk
new file mode 100644
index 00000000000..9b889afc1a9
--- /dev/null
+++ b/backends/platform/android/fatbundle.mk
@@ -0,0 +1,35 @@
+ALL_ABIS = armeabi-v7a arm64-v8a x86 x86_64
+OTHER_ABIS = $(filter-out $(ABI), $(ALL_ABIS))
+
+PATH_BUILD_LIBSSCUMMVM = $(foreach abi, $(OTHER_ABIS), $(PATH_BUILD)/lib/$(abi)/libscummvm.so)
+
+ANDROID_CONFIGURE_PATH := $(realpath $(srcdir)/configure)
+ANDROID_CONFIGFLAGS := $(filter-out --host=android-%, $(SAVED_CONFIGFLAGS))
+define BUILD_ANDROID
+SUBPATH_BUILD_LIBSCUMMVM_abi := ./build-android$(1)/libscummvm.so
+PATH_BUILD_LIBSCUMMVM_abi := $(PATH_BUILD)/lib/$(1)/libscummvm.so
+
+SUBPATH_BUILDS += ./build-android$(1)
+
+$$(SUBPATH_BUILD_LIBSCUMMVM_abi): SUBPATH_BUILD=./build-android$(1)
+$$(SUBPATH_BUILD_LIBSCUMMVM_abi): config.mk $$(EXECUTABLE)
+ $$(INSTALL) -d "$$(SUBPATH_BUILD)"
+ (cd "$$(SUBPATH_BUILD)" && \
+ $$(foreach VAR,$$(SAVED_ENV_VARS),$$(VAR)="$$(SAVED_$$(VAR))") \
+ "$$(ANDROID_CONFIGURE_PATH)" --host=android-$(1) $$(ANDROID_CONFIGFLAGS))
+ $$(MAKE) -C "$$(SUBPATH_BUILD)" $$(EXECUTABLE)
+
+$$(PATH_BUILD_LIBSCUMMVM_abi): PATH_BUILD_LIB=$(PATH_BUILD)/lib/$(1)
+$$(PATH_BUILD_LIBSCUMMVM_abi): $$(SUBPATH_BUILD_LIBSCUMMVM_abi)
+ $$(INSTALL) -d "$$(PATH_BUILD_LIB)"
+ $$(INSTALL) -c -m 644 "$$<" "$$@"
+
+endef
+
+SUBPATH_BUILDS :=
+$(foreach abi,$(OTHER_ABIS),$(eval $(call BUILD_ANDROID,$(abi))))
+
+androidfatbundlerelease: $(PATH_BUILD_LIBSSCUMMVM)
+ $(MAKE) $(AAB_MAIN_RELEASE)
+
+.PHONY: androidfatbundlerelease
Commit: 195a80873fc0faee296ea09b2e1107bed129ce5c
https://github.com/scummvm/scummvm/commit/195a80873fc0faee296ea09b2e1107bed129ce5c
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-11-12T22:43:57+01:00
Commit Message:
ANDROID: Adapt versionCode to fat bundles
The 0 value for arch will mean fat bundle.
It can also mean unspecified. That is all builds where we do not modify
the value according to the architecture (for example buildbot APKs).
Anyway, don't apply the version change now to avoid version downgrade for
buildbot users.
Changed paths:
dists/android/build.gradle
diff --git a/dists/android/build.gradle b/dists/android/build.gradle
index 5f24b6ba5b7..25eb4af78fc 100644
--- a/dists/android/build.gradle
+++ b/dists/android/build.gradle
@@ -54,10 +54,13 @@ android {
// (p is patch/bugfix release number)
// (b is build number, eg. re-release or beta testing was done on Play Store)
// (a is a number indicating the target architecture (ABI)):
- // (1: arm-v7a, 2: arm64-v8a, 3: x86, 4: x86_64)
- // eg. ScummVM 2.9.0 builds would have version codes: 2090001 - 2090004
+ // (0: unspecified/fat, 1: arm-v7a, 2: arm64-v8a, 3: x86, 4: x86_64)
+ // eg. ScummVM 2.10.0 builds would have version codes: 2100000 - 2100004
// --------------
- // ScummVM 2.8.0: 113 - 116 (arm-v7a, arm64-v8a, x86, x86_64 respectively)
+ // ScummVM 2.9.0: 2090001 - 2090004 (arm-v7a, arm64-v8a, x86, x86_64 respectively)
+ // ScummVM 2.8.1.1: 2081011 - 2081014 (arm-v7a, arm64-v8a, x86, x86_64 respectively) (release on Play Store)
+ // ScummVM 2.8.1: 2081001 - 2081004 (arm-v7a, arm64-v8a, x86, x86_64 respectively) (rejected on Play Store)
+ // ScummVM 2.8.0: 113 - 116 (arm-v7a, arm64-v8a, x86, x86_64 respectively) (release on Play Store)
// ScummVM 2.7.1: 109 - 112 (arm-v7a, arm64-v8a, x86, x86_64 respectively) (release on Play Store)
// Historical version codes:
// ScummVM 2.7.0.5: 105 - 108 (arm-v7a, arm64-v8a, x86, x86_64 respectively) (proper release on Play Store)
Commit: 12b35fb74131808d2a4910bb52a08784edbc8e5c
https://github.com/scummvm/scummvm/commit/12b35fb74131808d2a4910bb52a08784edbc8e5c
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-11-12T22:43:57+01:00
Commit Message:
ANDROID: Update clean rule
Make it verbose as the other clean rules and clean AAB files too
Changed paths:
backends/platform/android/android.mk
diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index 40f6028425a..3b87cc897c0 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -87,7 +87,7 @@ clean: androidclean
# SUBPATH_BUILDS is set in fatbundle.mk
androidclean:
- @$(RM) -rf $(PATH_BUILD) $(SUBPATH_BUILDS) *.apk
+ $(RM) -rf $(PATH_BUILD) $(SUBPATH_BUILDS) *.apk *.aab
androidrelease: $(APK_MAIN_RELEASE)
androidbundlerelease: $(AAB_MAIN_RELEASE)
Commit: 83091c3f0f1830d6c16e8dd6fab1e8160c7362c8
https://github.com/scummvm/scummvm/commit/83091c3f0f1830d6c16e8dd6fab1e8160c7362c8
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-11-12T22:43:57+01:00
Commit Message:
ANDROID: Cleanup PHONY targets
Changed paths:
backends/platform/android/android.mk
diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index 3b87cc897c0..ea5097e2521 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -81,27 +81,18 @@ $(AAB_MAIN_RELEASE): $(PATH_BUILD_GRADLE) $(PATH_BUILD_ASSETS) $(PATH_BUILD_ASSE
(cd $(PATH_BUILD); ./gradlew bundleRelease -PsplitAssets)
$(CP) $(PATH_BUILD)/build/outputs/bundle/release/$(AAB_MAIN_RELEASE) $@
-all: $(APK_MAIN)
-
clean: androidclean
# SUBPATH_BUILDS is set in fatbundle.mk
androidclean:
$(RM) -rf $(PATH_BUILD) $(SUBPATH_BUILDS) *.apk *.aab
+all: $(APK_MAIN)
+
androidrelease: $(APK_MAIN_RELEASE)
androidbundlerelease: $(AAB_MAIN_RELEASE)
-androidtestmain: $(APK_MAIN)
- (cd $(PATH_BUILD); ./gradlew installDebug)
- # $(ADB) install -g -r $(APK_MAIN)
- # $(ADB) shell am start -a android.intent.action.MAIN -c android.intent.category.LAUNCHER -n org.scummvm.scummvm/.ScummVMActivity
-
androidtest: $(APK_MAIN)
- # @set -e; for apk in $^; do \
- # $(ADB) install -g -r $$apk; \
- # done
- # $(ADB) shell am start -a android.intent.action.MAIN -c android.intent.category.LAUNCHER -n org.scummvm.scummvm/.ScummVMActivity
(cd $(PATH_BUILD); ./gradlew installDebug)
# used by buildbot!
@@ -119,6 +110,6 @@ androiddistrelease: androidrelease
sed 's/$$/\r/' < $$i > release/`basename $$i`.txt; \
done
-.PHONY: androidrelease androidbundlerelease androidtest $(PATH_BUILD_SRC)
+.PHONY: androidclean androidrelease androidbundlerelease androidtest androiddistdebug androiddistrelease
include $(srcdir)/backends/platform/android/fatbundle.mk
Commit: fdc6ab09f5889544efd83e6439bc77536fbed811
https://github.com/scummvm/scummvm/commit/fdc6ab09f5889544efd83e6439bc77536fbed811
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-11-12T22:43:57+01:00
Commit Message:
ANDROID: Make fat target more generic
It is now possible to build a fat debug APK, release APK, release bundle
Changed paths:
backends/platform/android/android.mk
backends/platform/android/fatbundle.mk
diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index ea5097e2521..4011f83a705 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -110,6 +110,7 @@ androiddistrelease: androidrelease
sed 's/$$/\r/' < $$i > release/`basename $$i`.txt; \
done
-.PHONY: androidclean androidrelease androidbundlerelease androidtest androiddistdebug androiddistrelease
+ANDROID_BUILD_RULES := androidrelease androidbundlerelease androidtest androiddistdebug androiddistrelease
+.PHONY: androidclean $(ANDROID_BUILD_RULES)
include $(srcdir)/backends/platform/android/fatbundle.mk
diff --git a/backends/platform/android/fatbundle.mk b/backends/platform/android/fatbundle.mk
index 9b889afc1a9..9ad00b27534 100644
--- a/backends/platform/android/fatbundle.mk
+++ b/backends/platform/android/fatbundle.mk
@@ -29,7 +29,7 @@ endef
SUBPATH_BUILDS :=
$(foreach abi,$(OTHER_ABIS),$(eval $(call BUILD_ANDROID,$(abi))))
-androidfatbundlerelease: $(PATH_BUILD_LIBSSCUMMVM)
- $(MAKE) $(AAB_MAIN_RELEASE)
+androidfatall $(subst android,androidfat,$(ANDROID_BUILD_RULES)): androidfat%: $(PATH_BUILD_LIBSSCUMMVM)
+ $(MAKE) $(if $(filter all,$*),$*,android$*)
-.PHONY: androidfatbundlerelease
+.PHONY: androidfatall $(subst android,androidfat,$(ANDROID_BUILD_RULES))
More information about the Scummvm-git-logs
mailing list