Skip to content

Commit

Permalink
Fix build failures.
Browse files Browse the repository at this point in the history
  • Loading branch information
MikuAuahDark committed Sep 28, 2023
1 parent 90dd5df commit 65693ca
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
6 changes: 5 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ android {
externalNativeBuild {
cmake {
arguments "-DANDROID_STL=c++_shared"
cppFlags "-Wno-error=cast-function-type-strict"
// https://issuetracker.google.com/issues/274493986
// 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
Expand Down Expand Up @@ -172,3 +171,8 @@ dependencies {
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.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'
}
2 changes: 1 addition & 1 deletion app/src/main/cpp/love
Submodule love updated 1 files
+1 −0 CMakeLists.txt
2 changes: 1 addition & 1 deletion app/src/main/cpp/megasource
Submodule megasource updated 91 files
+2 −2 CMakeLists.txt
+1 −2 libs/LuaJIT/android/arm64-v8a/jit/bc.lua
+2 −2 libs/LuaJIT/android/arm64-v8a/jit/bcsave.lua
+1 −1 libs/LuaJIT/android/arm64-v8a/jit/dis_arm.lua
+18 −26 libs/LuaJIT/android/arm64-v8a/jit/dis_arm64.lua
+1 −1 libs/LuaJIT/android/arm64-v8a/jit/dis_arm64be.lua
+1 −1 libs/LuaJIT/android/arm64-v8a/jit/dis_mips.lua
+1 −1 libs/LuaJIT/android/arm64-v8a/jit/dis_mips64.lua
+1 −1 libs/LuaJIT/android/arm64-v8a/jit/dis_mips64el.lua
+1 −1 libs/LuaJIT/android/arm64-v8a/jit/dis_mips64r6.lua
+1 −1 libs/LuaJIT/android/arm64-v8a/jit/dis_mips64r6el.lua
+1 −1 libs/LuaJIT/android/arm64-v8a/jit/dis_mipsel.lua
+1 −1 libs/LuaJIT/android/arm64-v8a/jit/dis_ppc.lua
+1 −1 libs/LuaJIT/android/arm64-v8a/jit/dis_x64.lua
+1 −1 libs/LuaJIT/android/arm64-v8a/jit/dis_x86.lua
+1 −2 libs/LuaJIT/android/arm64-v8a/jit/dump.lua
+1 −2 libs/LuaJIT/android/arm64-v8a/jit/p.lua
+1 −2 libs/LuaJIT/android/arm64-v8a/jit/v.lua
+396 −394 libs/LuaJIT/android/arm64-v8a/jit/vmdef.lua
+1 −1 libs/LuaJIT/android/arm64-v8a/jit/zone.lua
+ libs/LuaJIT/android/arm64-v8a/libluajit.a
+ libs/LuaJIT/android/arm64-v8a/libluajit.so
+79 −0 libs/LuaJIT/android/arm64-v8a/luajit.h
+1 −2 libs/LuaJIT/android/armeabi-v7a/jit/bc.lua
+2 −2 libs/LuaJIT/android/armeabi-v7a/jit/bcsave.lua
+1 −1 libs/LuaJIT/android/armeabi-v7a/jit/dis_arm.lua
+18 −26 libs/LuaJIT/android/armeabi-v7a/jit/dis_arm64.lua
+1 −1 libs/LuaJIT/android/armeabi-v7a/jit/dis_arm64be.lua
+1 −1 libs/LuaJIT/android/armeabi-v7a/jit/dis_mips.lua
+1 −1 libs/LuaJIT/android/armeabi-v7a/jit/dis_mips64.lua
+1 −1 libs/LuaJIT/android/armeabi-v7a/jit/dis_mips64el.lua
+1 −1 libs/LuaJIT/android/armeabi-v7a/jit/dis_mips64r6.lua
+1 −1 libs/LuaJIT/android/armeabi-v7a/jit/dis_mips64r6el.lua
+1 −1 libs/LuaJIT/android/armeabi-v7a/jit/dis_mipsel.lua
+1 −1 libs/LuaJIT/android/armeabi-v7a/jit/dis_ppc.lua
+1 −1 libs/LuaJIT/android/armeabi-v7a/jit/dis_x64.lua
+1 −1 libs/LuaJIT/android/armeabi-v7a/jit/dis_x86.lua
+1 −2 libs/LuaJIT/android/armeabi-v7a/jit/dump.lua
+1 −2 libs/LuaJIT/android/armeabi-v7a/jit/p.lua
+1 −2 libs/LuaJIT/android/armeabi-v7a/jit/v.lua
+396 −394 libs/LuaJIT/android/armeabi-v7a/jit/vmdef.lua
+1 −1 libs/LuaJIT/android/armeabi-v7a/jit/zone.lua
+ libs/LuaJIT/android/armeabi-v7a/libluajit.a
+ libs/LuaJIT/android/armeabi-v7a/libluajit.so
+79 −0 libs/LuaJIT/android/armeabi-v7a/luajit.h
+1 −2 libs/LuaJIT/android/x86/jit/bc.lua
+2 −2 libs/LuaJIT/android/x86/jit/bcsave.lua
+1 −1 libs/LuaJIT/android/x86/jit/dis_arm.lua
+18 −26 libs/LuaJIT/android/x86/jit/dis_arm64.lua
+1 −1 libs/LuaJIT/android/x86/jit/dis_arm64be.lua
+1 −1 libs/LuaJIT/android/x86/jit/dis_mips.lua
+1 −1 libs/LuaJIT/android/x86/jit/dis_mips64.lua
+1 −1 libs/LuaJIT/android/x86/jit/dis_mips64el.lua
+1 −1 libs/LuaJIT/android/x86/jit/dis_mips64r6.lua
+1 −1 libs/LuaJIT/android/x86/jit/dis_mips64r6el.lua
+1 −1 libs/LuaJIT/android/x86/jit/dis_mipsel.lua
+1 −1 libs/LuaJIT/android/x86/jit/dis_ppc.lua
+1 −1 libs/LuaJIT/android/x86/jit/dis_x64.lua
+1 −1 libs/LuaJIT/android/x86/jit/dis_x86.lua
+1 −2 libs/LuaJIT/android/x86/jit/dump.lua
+1 −2 libs/LuaJIT/android/x86/jit/p.lua
+1 −2 libs/LuaJIT/android/x86/jit/v.lua
+396 −394 libs/LuaJIT/android/x86/jit/vmdef.lua
+1 −1 libs/LuaJIT/android/x86/jit/zone.lua
+ libs/LuaJIT/android/x86/libluajit.a
+ libs/LuaJIT/android/x86/libluajit.so
+79 −0 libs/LuaJIT/android/x86/luajit.h
+1 −2 libs/LuaJIT/android/x86_64/jit/bc.lua
+2 −2 libs/LuaJIT/android/x86_64/jit/bcsave.lua
+1 −1 libs/LuaJIT/android/x86_64/jit/dis_arm.lua
+18 −26 libs/LuaJIT/android/x86_64/jit/dis_arm64.lua
+1 −1 libs/LuaJIT/android/x86_64/jit/dis_arm64be.lua
+1 −1 libs/LuaJIT/android/x86_64/jit/dis_mips.lua
+1 −1 libs/LuaJIT/android/x86_64/jit/dis_mips64.lua
+1 −1 libs/LuaJIT/android/x86_64/jit/dis_mips64el.lua
+1 −1 libs/LuaJIT/android/x86_64/jit/dis_mips64r6.lua
+1 −1 libs/LuaJIT/android/x86_64/jit/dis_mips64r6el.lua
+1 −1 libs/LuaJIT/android/x86_64/jit/dis_mipsel.lua
+1 −1 libs/LuaJIT/android/x86_64/jit/dis_ppc.lua
+1 −1 libs/LuaJIT/android/x86_64/jit/dis_x64.lua
+1 −1 libs/LuaJIT/android/x86_64/jit/dis_x86.lua
+1 −2 libs/LuaJIT/android/x86_64/jit/dump.lua
+1 −2 libs/LuaJIT/android/x86_64/jit/p.lua
+1 −2 libs/LuaJIT/android/x86_64/jit/v.lua
+396 −394 libs/LuaJIT/android/x86_64/jit/vmdef.lua
+1 −1 libs/LuaJIT/android/x86_64/jit/zone.lua
+ libs/LuaJIT/android/x86_64/libluajit.a
+ libs/LuaJIT/android/x86_64/libluajit.so
+79 −0 libs/LuaJIT/android/x86_64/luajit.h
+41 −6 libs/LuaJIT/android_build_readme.bat
+18 −12 libs/harfbuzz/src/hb-ft.cc

0 comments on commit 65693ca

Please sign in to comment.