diff --git a/.gitignore b/.gitignore
index e89e8759..43877657 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .project
+.cache
 .settings
 libxposed
 *.iml
diff --git a/build.gradle.kts b/build.gradle.kts
index d5453f61..8b4252a9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -82,6 +82,7 @@ fun Project.configureBaseExtension() {
 
         externalNativeBuild.cmake {
             version = "3.28.1+"
+            buildStagingDirectory = layout.buildDirectory.get().asFile
         }
 
         defaultConfig {
@@ -122,6 +123,7 @@ fun Project.configureBaseExtension() {
                     cppFlags("-std=c++20", *flags)
                     cFlags("-std=c18", *flags)
                     arguments(
+                        "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON",
                         "-DANDROID_STL=none",
                         "-DVERSION_CODE=$verCode",
                         "-DVERSION_NAME=$verName",
diff --git a/core b/core
index 1f80050e..7c3fe84e 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 1f80050e1dfc1a0f47202aa8d6c9c3e2b2bdc63d
+Subproject commit 7c3fe84e26729d95cda7ea3c3a14c0aafab0a3a6