Skip to content

Commit

Permalink
fix: regenerate and add linker flags for Android x86-64 (#15)
Browse files Browse the repository at this point in the history
  • Loading branch information
Johennes authored Dec 19, 2024
1 parent af45eb3 commit 846cdc8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ android {
}
}
ndk {
abiFilters "arm64-v8a", "armeabi-v7a"
abiFilters "arm64-v8a", "armeabi-v7a", "x86", "x86_64"
}
}

Expand Down
2 changes: 1 addition & 1 deletion example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1811,4 +1811,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 49b187f74553462550d36ec0be911b8ed042c199

COCOAPODS: 1.15.2
COCOAPODS: 1.16.2
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@
],
"scripts": {
"ubrn:android": "yarn ubrn:android:build --and-generate",
"ubrn:android:build": "ubrn build android --config ubrn.yaml",
"ubrn:android:build": "CARGO_TARGET_X86_64_LINUX_ANDROID_RUSTFLAGS=\"-L$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/17/lib/linux\" ubrn build android --config ubrn.yaml",
"ubrn:android:build:release": "yarn ubrn:android:build --release",
"ubrn:ios": "yarn ubrn:ios:build --and-generate && (cd example/ios && pod install)",
"ubrn:ios:build": "ubrn build ios --config ubrn.yaml",
"ubrn:ios:build:release": "yarn ubrn:ios:build --release",
"ubrn:checkout": "ubrn checkout --config ubrn.yaml",
"ubrn:clean": "rm -Rf cpp/ android/src/main/java ios/ src/Native* src/generated/ src/index.ts*",
"ubrn:clean": "del-cli cpp android/src/main/java ios \"src/Native*\" src/generated \"src/index.ts*\"",
"ubrn:generate": "ubrn generate all --config ubrn.yaml build/RnMatrixRustSdk.xcframework/ios-arm64/libmatrix_sdk_ffi.a",
"generate": "yarn ubrn:clean && yarn ubrn:checkout && yarn ubrn:android && yarn ubrn:ios",
"generate:release": "yarn ubrn:clean && yarn ubrn:checkout && yarn ubrn:android:build:release && yarn ubrn:ios:build:release && yarn ubrn:generate && (cd example/ios && pod install)",
Expand Down

0 comments on commit 846cdc8

Please sign in to comment.