Enable riscv64 for standalone build as well

LSPosed · Apr 18, 2024 · 7217ac6 · 7217ac6
1 parent c774d42
commit 7217ac6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.3.2"
+agp = "8.4.0-rc02"
 
 [plugins]
 agp-app = { id = "com.android.application", version.ref = "agp" }
@@ -9,7 +9,7 @@ lsplugin-publish = { id = "org.lsposed.lsplugin.publish", version = "1.1" }
 lsplugin-cmaker = { id = "org.lsposed.lsplugin.cmaker", version = "1.2" }
 
 [libraries]
-cxx = { module = "dev.rikka.ndk.thirdparty:cxx", version = "1.2.0" }
+cxx = { module = "org.lsposed.libcxx:libcxx", version = "27.0.11718014-beta1" }
 dobby = { module = "io.github.vvb2060.ndk:dobby", version = "1.2" }
 test-ext-junit = { module = "androidx.test.ext:junit", version = "1.1.5" }
 test-runner = { module = "androidx.test:runner", version = "1.5.2" }

diff --git a/lsplant/build.gradle.kts b/lsplant/build.gradle.kts
@@ -81,14 +81,14 @@ cmaker {
             "-Wno-gnu-string-literal-operator-template",
             "-Wno-c++2b-extensions",
         )
+        abiFilters("armeabi-v7a", "arm64-v8a", "x86", "x86_64", "riscv64")
         cppFlags += flags
         cFlags += flags
     }
     buildTypes {
         when (it.name) {
             "debug", "release" -> {
                 arguments += "-DANDROID_STL=c++_shared"
-                abiFilters("armeabi-v7a", "arm64-v8a", "x86", "x86_64", "riscv64")
             }
             "standalone" -> {
                 arguments += "-DANDROID_STL=none"