Skip to content

Commit 8e14e77

Browse files
zhuoweiAndrewSB
authored andcommitted
Use llvm-libc++ as STL, disable building of iconv, build only for armeabi-v7a, build icu 55.1
1 parent e406ef2 commit 8e14e77

File tree

2 files changed

+18
-7
lines changed

2 files changed

+18
-7
lines changed

build.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ NDK=`readlink -f $NDK`
1313

1414
export CLANG=1
1515

16-
for ARCH in armeabi armeabi-v7a arm64-v8a x86 x86_64; do
16+
for ARCH in armeabi-v7a; do
1717

1818
cd $BUILDDIR
1919

@@ -40,7 +40,7 @@ cd $BUILDDIR/$ARCH
4040

4141
# =========== libiconv.so ===========
4242

43-
[ -e libiconv.so ] || {
43+
true || [ -e libiconv.so ] || {
4444

4545
rm -rf libiconv-1.15
4646

@@ -163,12 +163,14 @@ cd $BUILDDIR/$ARCH
163163

164164
rm -rf icu
165165

166-
tar xvf ../icu4c-59_1-src.tgz
166+
[ -e ../icu4c-55_1-src.tgz ] || exit 1
167+
168+
tar xvf ../icu4c-55_1-src.tgz
167169

168170
cd icu/source
169171

170-
cp -f $BUILDDIR/config.sub .
171-
cp -f $BUILDDIR/config.guess .
172+
#cp -f $BUILDDIR/config.sub .
173+
#cp -f $BUILDDIR/config.guess .
172174

173175
[ -d cross ] || {
174176
mkdir cross

setCrossEnvironment-armeabi-v7a.sh

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/bin/sh
22

3+
NDK_STL="libc++"
4+
35
IFS='
46
'
57

@@ -21,15 +23,22 @@ NDK=`readlink -f $NDK`
2123
#echo NDK $NDK
2224
GCCPREFIX=arm-linux-androideabi
2325
[ -z "$NDK_TOOLCHAIN_VERSION" ] && NDK_TOOLCHAIN_VERSION=4.9
24-
[ -z "$PLATFORMVER" ] && PLATFORMVER=android-15
26+
[ -z "$PLATFORMVER" ] && PLATFORMVER=android-16
27+
GCCVER=4.8
2528
LOCAL_PATH=`dirname $0`
2629
if which realpath > /dev/null ; then
2730
LOCAL_PATH=`realpath $LOCAL_PATH`
2831
else
2932
LOCAL_PATH=`cd $LOCAL_PATH && pwd`
3033
fi
3134
ARCH=armeabi-v7a
32-
35+
STL_CFLAGS="-isystem$NDK/sources/cxx-stl/gnu-libstdc++/$GCCVER/include \
36+
-isystem$NDK/sources/cxx-stl/gnu-libstdc++/$GCCVER/libs/$ARCH/include"
37+
STL_LDFLAGS="-L$NDK/sources/cxx-stl/gnu-libstdc++/$GCCVER/libs/$ARCH"
38+
if [[ "$NDK_STL" -eq "libc++" ]] ; then
39+
STL_CFLAGS="-isystem$NDK/sources/cxx-stl/llvm-libc++/include"
40+
STL_LDFLAGS="-L$NDK/sources/cxx-stl/llvm-libc++/libs/$ARCH"
41+
fi
3342

3443
CFLAGS="
3544
-fexceptions

0 commit comments

Comments
 (0)