Annual Android versions bump for 2026 - #113761
Conversation
4b69507 to
3a6cd4e
Compare
lawnjelly
left a comment
There was a problem hiding this comment.
The march of progress, I guess, and the unquenchable thirst to update.
|
If the Godot Android Editor causes problems, then perhaps we can use this flag for now. |
From my testing, things seem to work as expected - bear in mind that the specified behavior only occurs on large screen devices - so we shouldn't need this flag. But we should validate and that's why this PR still has the |
3a6cd4e to
cee308d
Compare
|
I think we can go with this PR. We are still at the very start of 4.7 cycle and if we observe any changes, we would have time to address that. |
c99e7ab to
468de42
Compare
There was a problem hiding this comment.
Oof, that error is a wonky one. It must be setting off from the changes made to accomodate mingw-llvm, but that's now overlapping with Android clang. I think this can be safely fixed like this:
modules/text_server_adv/text_server_adv.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/text_server_adv/text_server_adv.h b/modules/text_server_adv/text_server_adv.h
index a04c23bdfc..ae55824f85 100644
--- a/modules/text_server_adv/text_server_adv.h
+++ b/modules/text_server_adv/text_server_adv.h
@@ -95,7 +95,7 @@ using namespace godot;
// Thirdparty headers.
GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wshadow")
-#if defined(__EMSCRIPTEN__) || __clang_major__ >= 21
+#if defined(__EMSCRIPTEN__) || (defined(__MINGW32__) && __clang_major__ >= 21)
GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunnecessary-virtual-specifier")
#endif
@@ -113,7 +113,7 @@ GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunnecessary-virtual-specifier")
#include <unicode/utypes.h>
GODOT_GCC_WARNING_POP
-#if defined(__EMSCRIPTEN__) || __clang_major__ >= 21
+#if defined(__EMSCRIPTEN__) || (defined(__MINGW32__) && __clang_major__ >= 21)
GODOT_CLANG_WARNING_POP
#endif
468de42 to
e86050e
Compare
|
@Repiteo Thanks! That seems to fix the build issue locally. |
|
Thanks! |
…n_2026 Annual Android versions bump for 2026
|
Cherry-picked for 4.6.3. |
|
Cherry-picked for 4.5.3. |
…n_2026 Annual Android versions bump for 2026
No description provided.