change cmake for android

Revert "android cmake no found"
This reverts commit f0ffc497a8.
2026-10-24 10:02:46 -04:00 · 2026-10-24 07:46:05 +03:00 · 2026-10-23 19:11:01 +03:00 · 2026-10-23 19:00:59 +03:00 · 2026-10-23 18:12:03 +03:00 · 2026-10-23 18:05:45 +03:00
2 changed files with 17 additions and 1 deletions
@@ -259,7 +259,7 @@ android {

    externalNativeBuild {
        cmake {
-            version = "3.31.6"
+            version = "3.31.5"
            path = file("${edenDir}/CMakeLists.txt")
        }
    }
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 /* SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project */
 /* SPDX-License-Identifier: GPL-2.0-or-later */

@@ -5,9 +8,22 @@

 #define __ASSEMBLY__

+// Newer Linux UAPI headers check __ASSEMBLER__ instead of __ASSEMBLY__ to hide C declarations.
+// Without it, asm-generic/signal.h redeclares sigset_t and clashes with glibc's. Only define it
+// around these includes, since glibc headers also look at __ASSEMBLER__.
+#ifndef __ASSEMBLER__
+#define __ASSEMBLER__
+#define EDEN_NCE_UNDEF_ASSEMBLER
+#endif
+
 #include <asm-generic/signal.h>
 #include <asm-generic/unistd.h>

+#ifdef EDEN_NCE_UNDEF_ASSEMBLER
+#undef __ASSEMBLER__
+#undef EDEN_NCE_UNDEF_ASSEMBLER
+#endif
+
 #define ReturnToRunCodeByExceptionLevelChangeSignal SIGUSR2
 #define BreakFromRunCodeSignal SIGURG
 #define GuestAccessFaultSignal SIGSEGV
Author	SHA1	Message	Date
PavelBARABANOV	84ed9692f9	change cmake for android	2026-10-24 07:46:05 +03:00
PavelBARABANOV	9cdc391275	Revert "android cmake no found" This reverts commit `f0ffc497a8`.	2026-10-23 19:11:01 +03:00
PavelBARABANOV	f0ffc497a8	android cmake no found	2026-10-23 19:00:59 +03:00
PavelBARABANOV	128ecaf55a	lic	2026-10-23 18:12:03 +03:00
PavelBARABANOV	ed98b1127b	Fix aarch builds	2026-10-23 18:05:45 +03:00