File tree Expand file tree Collapse file tree 2 files changed +18
-7
lines changed Expand file tree Collapse file tree 2 files changed +18
-7
lines changed Original file line number Diff line number Diff line change @@ -13,7 +13,7 @@ NDK=`readlink -f $NDK`
13
13
14
14
export CLANG=1
15
15
16
- for ARCH in armeabi armeabi -v7a arm64-v8a x86 x86_64 ; do
16
+ for ARCH in armeabi-v7a; do
17
17
18
18
cd $BUILDDIR
19
19
@@ -40,7 +40,7 @@ cd $BUILDDIR/$ARCH
40
40
41
41
# =========== libiconv.so ===========
42
42
43
- [ -e libiconv.so ] || {
43
+ true || [ -e libiconv.so ] || {
44
44
45
45
rm -rf libiconv-1.15
46
46
@@ -163,12 +163,14 @@ cd $BUILDDIR/$ARCH
163
163
164
164
rm -rf icu
165
165
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
167
169
168
170
cd icu/source
169
171
170
- cp -f $BUILDDIR /config.sub .
171
- cp -f $BUILDDIR /config.guess .
172
+ # cp -f $BUILDDIR/config.sub .
173
+ # cp -f $BUILDDIR/config.guess .
172
174
173
175
[ -d cross ] || {
174
176
mkdir cross
Original file line number Diff line number Diff line change 1
1
#! /bin/sh
2
2
3
+ NDK_STL=" libc++"
4
+
3
5
IFS='
4
6
'
5
7
@@ -21,15 +23,22 @@ NDK=`readlink -f $NDK`
21
23
# echo NDK $NDK
22
24
GCCPREFIX=arm-linux-androideabi
23
25
[ -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
25
28
LOCAL_PATH=` dirname $0 `
26
29
if which realpath > /dev/null ; then
27
30
LOCAL_PATH=` realpath $LOCAL_PATH `
28
31
else
29
32
LOCAL_PATH=` cd $LOCAL_PATH && pwd`
30
33
fi
31
34
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
33
42
34
43
CFLAGS="
35
44
-fexceptions
You can’t perform that action at this time.
0 commit comments