Skip to content

Commit 2734641

Browse files
committed
android productions is bigger, try strip
1 parent c53bca7 commit 2734641

File tree

9 files changed

+10
-7
lines changed

9 files changed

+10
-7
lines changed

configs/meson-crossfiles/arm64-android.meson

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ c = 'aarch64-linux-android21-clang'
33
cpp = 'aarch64-linux-android21-clang++'
44
ar = 'llvm-ar'
55
strip = 'llvm-strip'
6+
ranlib = 'llvm-ranlib'
67
pkgconfig = 'pkg-config'
78

89
[properties]

configs/meson-crossfiles/armv7a-android.meson

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ c = 'armv7a-linux-androideabi21-clang'
33
cpp = 'armv7a-linux-androideabi21-clang++'
44
ar = 'llvm-ar'
55
strip = 'llvm-strip'
6+
ranlib = 'llvm-ranlib'
67
pkgconfig = 'pkg-config'
78

89
[properties]

configs/meson-crossfiles/x86-android.meson

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ c = 'i686-linux-android21-clang'
33
cpp = 'i686-linux-android21-clang++'
44
ar = 'llvm-ar'
55
strip = 'llvm-strip'
6+
ranlib = 'llvm-ranlib'
67
pkgconfig = 'pkg-config'
78

89
[properties]

configs/meson-crossfiles/x86_64-android.meson

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ c = 'x86_64-linux-android21-clang'
33
cpp = 'x86_64-linux-android21-clang++'
44
ar = 'llvm-ar'
55
strip = 'llvm-strip'
6+
ranlib = 'llvm-ranlib'
67
pkgconfig = 'pkg-config'
78

89
[properties]

do-compile/android/bluray.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ echo
5858

5959
export CFLAGS="$CFLAGS"
6060
export LDFLAGS="$CFLAGS"
61-
61+
export STRIP="$MR_STRIP"
6262
export CC="$MR_TRIPLE_CC"
6363
export CXX="$MR_TRIPLE_CXX"
6464
export AR="$MR_AR"

do-compile/android/cmake-compatible.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ cmake -S ${MR_BUILD_SOURCE} \
4747
-DCMAKE_RANLIB=${MR_RANLIB} \
4848
-DCMAKE_AR=${MR_AR} \
4949
-DCMAKE_AS=${MR_AS} \
50+
-DCMAKE_STRIP=${MR_STRIP} \
5051
-DCMAKE_CXX_COMPILER_RANLIB=${MR_RANLIB} \
5152
-DANDROID_PLATFORM=android-${MR_ANDROID_API} \
5253
-DANDROID_STL=c++_shared \
@@ -65,7 +66,7 @@ else
6566
fi
6667

6768
if [[ -n $CMAKE_COMPONENT ]];then
68-
cmake --install . --component "$CMAKE_COMPONENT"
69+
cmake --install . --strip --component "$CMAKE_COMPONENT"
6970
else
70-
cmake --install .
71+
cmake --install . --strip
7172
fi

do-compile/android/dvdread.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ echo
5858

5959
export CFLAGS="$CFLAGS"
6060
export LDFLAGS="$CFLAGS"
61-
61+
export STRIP="$MR_STRIP"
6262
export CC="$MR_TRIPLE_CC"
6363
export CXX="$MR_TRIPLE_CXX"
6464
export AR="$MR_AR"

do-compile/android/meson-compatible.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ export CXX="$MR_TRIPLE_CXX"
4141
export AR="$MR_AR"
4242
export AS="$RM_AS"
4343
export RANLIB="$MR_RANLIB"
44+
export STRIP="$MR_STRIP"
4445

4546
if [[ $(uname -m) != "$MR_ARCH" || "$MR_FORCE_CROSS" ]]; then
4647
if [[ $MR_IS_SIMULATOR == 1 ]]; then

do-compile/apple/xml2.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@ export LDFLAGS="$CFLAGS"
5050

5151
export CC="$MR_CC"
5252
export CXX="$MR_CXX"
53-
export AR="$MR_AR"
54-
export AS="$RM_AS"
55-
export RANLIB="$MR_RANLIB"
5653

5754
./autogen.sh \
5855
$CFG_FLAGS \

0 commit comments

Comments
 (0)