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

lephilousophe noreply at scummvm.org
Fri Oct 30 08:10:44 UTC 2026


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

Summary:
1a46bf085a ANDROID: Fix run on older Android
e16d0de7a9 ANDROID: Strip binaries when building package


Commit: 1a46bf085a0d71a7ad3dd732f3a34d73b1fa50ef
    https://github.com/scummvm/scummvm/commit/1a46bf085a0d71a7ad3dd732f3a34d73b1fa50ef
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2026-10-30T08:52:04+01:00

Commit Message:
ANDROID: Fix run on older Android

new on older Android didn't provide an object aligned enough.
Using C++17, new gets an alignment argument which allows to have proper
alignment for our mixer.

In addition explicitely initialize _plugEvent

Changed paths:
    backends/mixer/android/android-mixer.cpp
    backends/module.mk


diff --git a/backends/mixer/android/android-mixer.cpp b/backends/mixer/android/android-mixer.cpp
index 2c366ab1e62..3d680a0f4e5 100644
--- a/backends/mixer/android/android-mixer.cpp
+++ b/backends/mixer/android/android-mixer.cpp
@@ -40,7 +40,7 @@ extern const char *android_log_tag;
 
 class AndroidMixerManagerImpl : public AndroidMixerManager, public oboe::AudioStreamDataCallback {
 public:
-	AndroidMixerManagerImpl() : _chunkSize(0), _buffer(nullptr), _stream(nullptr), _latency(nullptr), _audio_thread_exit(false), _underflows(0) {}
+	AndroidMixerManagerImpl() : _chunkSize(0), _buffer(nullptr), _stream(nullptr), _latency(nullptr), _audio_thread_exit(false), _underflows(0), _plugEvent(false) {}
 	~AndroidMixerManagerImpl() override;
 
 	void init() override;
diff --git a/backends/module.mk b/backends/module.mk
index b2d32984f6e..89b39dcb24b 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -377,8 +377,8 @@ MODULE_OBJS += \
 	text-to-speech/android/android-text-to-speech.o
 endif
 
-# Oboe headers need C++14...
-$(MODULE)/mixer/android/android-mixer.o: CXXFLAGS += "-std=c++14"
+# Oboe headers need C++14 and alignment when using new needs C++17
+$(MODULE)/mixer/android/android-mixer.o: CXXFLAGS += "-std=c++17"
 
 endif
 


Commit: e16d0de7a9a3ea7a0a9eda8219125be9f7d22fbb
    https://github.com/scummvm/scummvm/commit/e16d0de7a9a3ea7a0a9eda8219125be9f7d22fbb
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2026-10-30T09:08:52+01:00

Commit Message:
ANDROID: Strip binaries when building package

We only strip debug info as symbols are helpful to get meaningful
stacktrace on the Android console.

A better way must be implemented by letting Gradle take care of that but
that needs heavier toolchain modifications.

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


diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index f5b1636e044..5d0f8964d9a 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -66,11 +66,11 @@ endif
 
 $(PATH_BUILD_LIBSCUMMVM): libscummvm.so | $(PATH_BUILD)
 	$(INSTALL) -d  $(PATH_BUILD_LIB)
-	$(INSTALL) -c -m 644 $< $@
+	$(STRIP) -S $< -o $@
 
 $(PATH_BUILD_LOADER): libloader.so | $(PATH_BUILD)
 	$(INSTALL) -d  $(PATH_BUILD_LIB)
-	$(INSTALL) -c -m 644 $< $@
+	$(STRIP) -S $< -o $@
 
 $(APK_MAIN): $(PATH_BUILD_GRADLE) $(PATH_BUILD_ASSETS)/MD5SUMS $(PATH_BUILD_LIBSCUMMVM) $(PATH_BUILD_LOADER) | $(PATH_BUILD)
 	(cd $(PATH_BUILD); ./gradlew assembleDebug)




More information about the Scummvm-git-logs mailing list