Skip to content

Commit 5dceb68

Browse files
authored
Merge pull request #5706 from msupply-foundation/v2.3.4-64bitonly
Reduce apk size
2 parents c4c3d8a + 10bd1ca commit 5dceb68

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

client/packages/android/app/src/main/jniLibs/armeabi-v7a/.gitignore

-2
This file was deleted.

client/packages/android/build_remote_server_libs.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set -e
77
export AR=${NDK_BIN}/llvm-ar
88
export CC_armv7_linux_androideabi=${NDK_BIN}/armv7a-linux-androideabi22-clang
99

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

1818
# Copy built .so files to jniLib
1919
cp "server-lib/aarch64-linux-android/release/libremote_server_android.so" "app/src/main/jniLibs/arm64-v8a/"
20-
cp "server-lib/armv7-linux-androideabi/release/libremote_server_android.so" "app/src/main/jniLibs/armeabi-v7a/"

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "open-msupply",
33
"//": "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",
4-
"version": "2.3.03",
4+
"version": "2.3.04",
55
"private": true,
66
"scripts": {
77
"start": "cd ./server && cargo run & cd ./client && yarn start-local",

server/android/.cargo/config.toml

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
# PATH=$PATH:$NDK_BIN cargo build --target aarch64-linux-android --release
77

88
[build]
9-
target = ["aarch64-linux-android", "armv7-linux-androideabi"]
9+
target = ["aarch64-linux-android"]
1010

1111
[target.aarch64-linux-android]
1212
linker = "aarch64-linux-android22-clang"
13-
[target.armv7-linux-androideabi]
14-
linker = "armv7a-linux-androideabi22-clang"
13+
14+
[profile.release]
15+
opt-level = "s"

0 commit comments

Comments
 (0)