Skip to content

Commit c6595a8

Browse files
committed
Android NDK: no archive symbol table (run ranlib)
1 parent 6ce0bf7 commit c6595a8

File tree

7 files changed

+39
-47
lines changed

7 files changed

+39
-47
lines changed

do-compile/android/bluray.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,15 @@ echo "CFG_FLAGS: $CFG_FLAGS"
8080
echo "CFLAGS: $CFLAGS"
8181
echo
8282

83-
export CC="$MR_TRIPLE_CC"
8483
export CFLAGS="$CFLAGS"
8584
export LDFLAGS="$CFLAGS"
8685

86+
export CC="$MR_TRIPLE_CC"
87+
export CXX="$MR_TRIPLE_CXX"
88+
export AR="$MR_AR"
89+
export AS="$RM_AS"
90+
export RANLIB="$MR_RANLIB"
91+
8792
./configure $CFG_FLAGS
8893

8994
#----------------------

do-compile/android/cmake-compatible.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ cmake -S ${MR_BUILD_SOURCE} \
4141
-DCMAKE_INSTALL_PREFIX=${MR_BUILD_PREFIX} \
4242
-DANDROID_NDK=${MR_ANDROID_NDK_HOME} \
4343
-DANDROID_ABI=${MR_ANDROID_ABI} \
44+
-DCMAKE_RANLIB=${MR_RANLIB} \
45+
-DCMAKE_AR=${MR_AR} \
46+
-DCMAKE_AS=${MR_AS} \
47+
-DCMAKE_CXX_COMPILER_RANLIB=${MR_RANLIB} \
4448
-DANDROID_PLATFORM=android-${MR_ANDROID_API} \
4549
-DANDROID_STL=c++_shared \
4650
-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=${MR_BUILD_PREFIX}/libs/${MR_ANDROID_ABI} \

do-compile/android/dvdread.sh

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,6 @@ set -e
2020
THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
2121
cd "$THIS_DIR"
2222

23-
echo "=== [$0] check env begin==="
24-
env_assert "MR_ARCH"
25-
env_assert "MR_BUILD_NAME"
26-
env_assert "MR_CC"
27-
env_assert "MR_BUILD_SOURCE"
28-
env_assert "MR_BUILD_PREFIX"
29-
env_assert "MR_SYS_ROOT"
30-
env_assert "MR_HOST_NPROC"
31-
echo "MR_DEBUG:$MR_DEBUG"
32-
echo "===check env end==="
33-
3423
# prepare build config
3524
CFG_FLAGS="--prefix=$MR_BUILD_PREFIX --disable-dependency-tracking --disable-silent-rules --disable-apidoc --enable-static --disable-shared"
3625
CFLAGS="$MR_OTHER_CFLAGS"
@@ -65,13 +54,18 @@ echo
6554
echo "CC: $MR_TRIPLE_CC"
6655
echo "CFG_FLAGS: $CFG_FLAGS"
6756
echo "CFLAGS: $CFLAGS"
68-
echo
57+
echo
58+
59+
export CFLAGS="$CFLAGS"
60+
export LDFLAGS="$CFLAGS"
61+
62+
export CC="$MR_TRIPLE_CC"
63+
export CXX="$MR_TRIPLE_CXX"
64+
export AR="$MR_AR"
65+
export AS="$RM_AS"
66+
export RANLIB="$MR_RANLIB"
6967

70-
./configure $CFG_FLAGS \
71-
CC="$MR_TRIPLE_CC" \
72-
CFLAGS="$CFLAGS" \
73-
LDFLAGS="$CFLAGS" \
74-
>/dev/null
68+
./configure $CFG_FLAGS
7569

7670
#----------------------
7771
echo "----------------------"

do-compile/android/meson-compatible.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,11 @@ else
3636
CFG_FLAGS="$CFG_FLAGS --buildtype=release"
3737
fi
3838

39-
export CC="$MR_CC"
40-
export CXX="$MR_CXX"
39+
export CC="$MR_TRIPLE_CC"
40+
export CXX="$MR_TRIPLE_CXX"
41+
export AR="$MR_AR"
42+
export AS="$RM_AS"
43+
export RANLIB="$MR_RANLIB"
4144

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

do-compile/android/openssl.sh

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,6 @@ set -e
2525
THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
2626
cd "$THIS_DIR"
2727

28-
echo "=== [$0] check env begin==="
29-
env_assert "MR_ARCH"
30-
env_assert "MR_CC"
31-
env_assert "MR_TRIPLE"
32-
env_assert "MR_BUILD_NAME"
33-
env_assert "MR_BUILD_SOURCE"
34-
env_assert "MR_BUILD_PREFIX"
35-
env_assert "MR_HOST_NPROC"
36-
echo "MR_DEBUG:$MR_DEBUG"
37-
echo "===check env end==="
38-
3928
case $_MR_ARCH in
4029
armv7a)
4130
target=android-arm
@@ -82,6 +71,9 @@ else
8271
export C_FLAGS="$C_FLAGS"
8372
export CXXFLAG="$C_FLAGS"
8473
export CC="$MR_CC --target $MR_TRIPLE"
74+
export AR="$MR_AR"
75+
export AS="$RM_AS"
76+
export RANLIB="$MR_RANLIB"
8577

8678
./Configure $CFG_FLAGS
8779
fi

do-compile/android/unibreak.sh

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,6 @@ set -e
2020
THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
2121
cd "$THIS_DIR"
2222

23-
echo "=== [$0] check env begin==="
24-
env_assert "MR_ARCH"
25-
env_assert "MR_BUILD_NAME"
26-
env_assert "MR_CC"
27-
env_assert "MR_BUILD_SOURCE"
28-
env_assert "MR_BUILD_PREFIX"
29-
env_assert "MR_SYS_ROOT"
30-
env_assert "MR_HOST_NPROC"
31-
echo "MR_DEBUG:$MR_DEBUG"
32-
echo "===check env end==="
33-
3423
CFG_FLAGS="--prefix=$MR_BUILD_PREFIX --enable-static --disable-shared --silent"
3524
CFLAGS="$MR_OTHER_CFLAGS"
3625

@@ -58,10 +47,16 @@ echo "generate configure"
5847

5948
./autogen.sh 1>/dev/null
6049

61-
./configure $CFG_FLAGS \
62-
CC="$MR_TRIPLE_CC" \
63-
CFLAGS="$CFLAGS" \
64-
LDFLAGS="$CFLAGS" 1>/dev/null
50+
export CFLAGS="$CFLAGS"
51+
export LDFLAGS="$CFLAGS"
52+
53+
export CC="$MR_TRIPLE_CC"
54+
export CXX="$MR_TRIPLE_CXX"
55+
export AR="$MR_AR"
56+
export AS="$RM_AS"
57+
export RANLIB="$MR_RANLIB"
58+
59+
./configure $CFG_FLAGS
6560

6661
#----------------------
6762
echo "----------------------"

do-compile/android/yuv.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,3 @@
1717
# call common cmake build shell
1818
./cmake-compatible.sh
1919

20-

0 commit comments

Comments
 (0)