Android #144

README.md

@@ -1,7 +1,7 @@
 | Pull Request | Commit | Title | Author | Merged? |
 |----|----|----|----|----|
-| [12074](https://github.com/yuzu-emu/yuzu//pull/12074) | [`340548aba`](https://github.com/yuzu-emu/yuzu//pull/12074/files) | Implement Native Code Execution (NCE) | [GPUCode](https://github.com/GPUCode/) | Yes |
-| [12204](https://github.com/yuzu-emu/yuzu//pull/12204) | [`7dddf5cb3`](https://github.com/yuzu-emu/yuzu//pull/12204/files) | android: Multi directory UI | [t895](https://github.com/t895/) | Yes |
+| [12074](https://github.com/yuzu-emu/yuzu//pull/12074) | [`a76a8fb5f`](https://github.com/yuzu-emu/yuzu//pull/12074/files) | Implement Native Code Execution (NCE) | [GPUCode](https://github.com/GPUCode/) | Yes |
+| [12204](https://github.com/yuzu-emu/yuzu//pull/12204) | [`caa83609f`](https://github.com/yuzu-emu/yuzu//pull/12204/files) | android: Multi directory UI | [t895](https://github.com/t895/) | Yes |
 
 
 End of merge log. You can find the original README.md below the break.

src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GameHelper.kt

@@ -58,8 +58,8 @@ object GameHelper {
                 gameDirs.removeAt(it - offset)
                 offset++
             }
+            NativeConfig.setGameDirs(gameDirs.toTypedArray())
         }
-        NativeConfig.setGameDirs(gameDirs.toTypedArray())
 
         // Cache list of games found on disk
         val serializedGames = mutableSetOf<String>()

src/common/host_memory.cpp

@@ -541,7 +541,7 @@ public:
         if (write) {
             flags |= PROT_WRITE;
         }
-#ifdef HAS_NCE
+#ifdef ARCHITECTURE_arm64
         if (execute) {
             flags |= PROT_EXEC;
         }