Skip to content

Commit

Permalink
Merge pull request #5706 from msupply-foundation/v2.3.4-64bitonly
Browse files Browse the repository at this point in the history
Reduce apk size
  • Loading branch information
andreievg authored Dec 4, 2024
2 parents c4c3d8a + 10bd1ca commit 5dceb68
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.

This file was deleted.

3 changes: 1 addition & 2 deletions client/packages/android/build_remote_server_libs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set -e
export AR=${NDK_BIN}/llvm-ar
export CC_armv7_linux_androideabi=${NDK_BIN}/armv7a-linux-androideabi22-clang

# Build arm64-v8a:aarch64-linux-android and armeabi-v7a:armv7-linux-androideabi
# Build arm64-v8a:aarch64-linux-android (Defined in cargo.toml)
PATH=PATH=$PATH:$NDK_BIN \
cargo build \
--release \
Expand All @@ -17,4 +17,3 @@ PATH=PATH=$PATH:$NDK_BIN \

# Copy built .so files to jniLib
cp "server-lib/aarch64-linux-android/release/libremote_server_android.so" "app/src/main/jniLibs/arm64-v8a/"
cp "server-lib/armv7-linux-androideabi/release/libremote_server_android.so" "app/src/main/jniLibs/armeabi-v7a/"
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "open-msupply",
"//": "Main version for the app, should be in semantic version format (any release candidate or test build should be separated by '-' i.e. 1.1.1-rc1 or 1.1.1-test",
"version": "2.3.03",
"version": "2.3.04",
"private": true,
"scripts": {
"start": "cd ./server && cargo run & cd ./client && yarn start-local",
Expand Down
7 changes: 4 additions & 3 deletions server/android/.cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@
# PATH=$PATH:$NDK_BIN cargo build --target aarch64-linux-android --release

[build]
target = ["aarch64-linux-android", "armv7-linux-androideabi"]
target = ["aarch64-linux-android"]

[target.aarch64-linux-android]
linker = "aarch64-linux-android22-clang"
[target.armv7-linux-androideabi]
linker = "armv7a-linux-androideabi22-clang"

[profile.release]
opt-level = "s"

0 comments on commit 5dceb68

Please sign in to comment.