Bladeren bron

Fix build failures.

Miku AuahDark 2 jaren geleden
bovenliggende
commit
65693ca2ff
3 gewijzigde bestanden met toevoegingen van 7 en 3 verwijderingen
  1. 5 1
      app/build.gradle
  2. 1 1
      app/src/main/cpp/love
  3. 1 1
      app/src/main/cpp/megasource

+ 5 - 1
app/build.gradle

@@ -19,7 +19,6 @@ android {
         externalNativeBuild {
         externalNativeBuild {
             cmake {
             cmake {
                 arguments "-DANDROID_STL=c++_shared"
                 arguments "-DANDROID_STL=c++_shared"
-                cppFlags "-Wno-error=cast-function-type-strict"
                 // https://issuetracker.google.com/issues/274493986
                 // https://issuetracker.google.com/issues/274493986
                 // Transitive shared library that's added through `add_dependencies` is not taken into
                 // Transitive shared library that's added through `add_dependencies` is not taken into
                 // account. This result in liboboe.so and libluajit.so not get included into the final
                 // account. This result in liboboe.so and libluajit.so not get included into the final
@@ -172,3 +171,8 @@ dependencies {
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'com.google.oboe:oboe:1.7.0'
     implementation 'com.google.oboe:oboe:1.7.0'
 }
 }
+
+// We don't even use Kotlin. Why we have to suffer...
+configurations.implementation {
+    exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
+}

+ 1 - 1
app/src/main/cpp/love

@@ -1 +1 @@
-Subproject commit 96040b2b2ab883087d1c8adbab60967143f844e8
+Subproject commit f43c6fedebdf0f0a241514271c141ac62e90ff6e

+ 1 - 1
app/src/main/cpp/megasource

@@ -1 +1 @@
-Subproject commit 84a7cbb396de12f13f9680bcb911a993fe49c49e
+Subproject commit 44ba332ebeeca89e28ed9d24ea32819b197861bf