Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
L
libzmq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
libzmq
Commits
dc40c95c
Commit
dc40c95c
authored
8 years ago
by
Joe Eli McIlvain
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2028 from bluca/update_ndk
Problem: Android CI NDK version and C++ ABI are outdated
parents
33ed5692
b4abaad2
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
19 deletions
+19
-19
android_build_helper.sh
builds/android/android_build_helper.sh
+11
-11
build.sh
builds/android/build.sh
+1
-1
ci_build.sh
builds/android/ci_build.sh
+7
-7
No files found.
builds/android/android_build_helper.sh
View file @
dc40c95c
...
...
@@ -75,17 +75,17 @@ function android_build_env {
if
[
-z
"
$ANDROID_NDK_ROOT
"
]
;
then
ANDROID_BUILD_FAIL+
=(
"Please set the ANDROID_NDK_ROOT environment variable"
)
ANDROID_BUILD_FAIL+
=(
" (eg.
\"
/home/user/android/android-ndk-r
9d
\"
)"
)
ANDROID_BUILD_FAIL+
=(
" (eg.
\"
/home/user/android/android-ndk-r
11c
\"
)"
)
fi
if
[
-z
"
$TOOLCHAIN_PATH
"
]
;
then
ANDROID_BUILD_FAIL+
=(
"Please set the TOOLCHAIN_PATH environment variable"
)
ANDROID_BUILD_FAIL+
=(
" (eg.
\"
/home/user/android/android-ndk-r
9d/toolchains/arm-linux-androideabi-4.8
/prebuilt/linux-x86_64/bin
\"
)"
)
ANDROID_BUILD_FAIL+
=(
" (eg.
\"
/home/user/android/android-ndk-r
11c/toolchains/arm-linux-androideabi-4.9
/prebuilt/linux-x86_64/bin
\"
)"
)
fi
if
[
-z
"
$TOOLCHAIN_NAME
"
]
;
then
ANDROID_BUILD_FAIL+
=(
"Please set the TOOLCHAIN_NAME environment variable"
)
ANDROID_BUILD_FAIL+
=(
" (eg.
\"
arm-linux-androideabi-4.
8
\"
)"
)
ANDROID_BUILD_FAIL+
=(
" (eg.
\"
arm-linux-androideabi-4.
9
\"
)"
)
fi
if
[
-z
"
$TOOLCHAIN_HOST
"
]
;
then
...
...
@@ -210,21 +210,21 @@ function _android_build_opts_process_cxx_stl {
;;
esac
;;
gnustl_shared_4
8
)
gnustl_shared_4
9
)
LIBS+
=
" -lgnustl_shared"
CPPFLAGS+
=
" -I
${
ANDROID_NDK_ROOT
}
/sources/cxx-stl/gnu-libstdc++/4.
8
/include"
CPPFLAGS+
=
" -I
${
ANDROID_NDK_ROOT
}
/sources/cxx-stl/gnu-libstdc++/4.
9
/include"
case
"
${
TOOLCHAIN_ARCH
}
"
in
arm
)
LDFLAGS+
=
" -L
${
ANDROID_NDK_ROOT
}
/sources/cxx-stl/gnu-libstdc++/4.
8
/libs/armeabi"
CPPFLAGS+
=
" -I
${
ANDROID_NDK_ROOT
}
/sources/cxx-stl/gnu-libstdc++/4.
8
/libs/armeabi/include"
LDFLAGS+
=
" -L
${
ANDROID_NDK_ROOT
}
/sources/cxx-stl/gnu-libstdc++/4.
9
/libs/armeabi"
CPPFLAGS+
=
" -I
${
ANDROID_NDK_ROOT
}
/sources/cxx-stl/gnu-libstdc++/4.
9
/libs/armeabi/include"
;;
x86
)
LDFLAGS+
=
" -L
${
ANDROID_NDK_ROOT
}
/sources/cxx-stl/gnu-libstdc++/4.
8
/libs/x86"
CPPFLAGS+
=
" -I
${
ANDROID_NDK_ROOT
}
/sources/cxx-stl/gnu-libstdc++/4.
8
/libs/x86/include"
LDFLAGS+
=
" -L
${
ANDROID_NDK_ROOT
}
/sources/cxx-stl/gnu-libstdc++/4.
9
/libs/x86"
CPPFLAGS+
=
" -I
${
ANDROID_NDK_ROOT
}
/sources/cxx-stl/gnu-libstdc++/4.
9
/libs/x86/include"
;;
mips
)
LDFLAGS+
=
" -L
${
ANDROID_NDK_ROOT
}
/sources/cxx-stl/gnu-libstdc++/4.
8
/libs/mips"
CPPFLAGS+
=
" -I
${
ANDROID_NDK_ROOT
}
/sources/cxx-stl/gnu-libstdc++/4.
8
/libs/mips/include"
LDFLAGS+
=
" -L
${
ANDROID_NDK_ROOT
}
/sources/cxx-stl/gnu-libstdc++/4.
9
/libs/mips"
CPPFLAGS+
=
" -I
${
ANDROID_NDK_ROOT
}
/sources/cxx-stl/gnu-libstdc++/4.
9
/libs/mips/include"
;;
*
)
ANDROID_BUILD_FAIL+
=(
"Unknown combination for ANDROID_BUILD_CXXSTL and TOOLCHAIN_ARCH"
)
...
...
This diff is collapsed.
Click to expand it.
builds/android/build.sh
View file @
dc40c95c
...
...
@@ -8,7 +8,7 @@ ANDROID_BUILD_DIR="$(pwd)"
source
${
ANDROID_BUILD_DIR
}
/android_build_helper.sh
# Choose a C++ standard library implementation from the ndk
ANDROID_BUILD_CXXSTL
=
"gnustl_shared_4
8
"
ANDROID_BUILD_CXXSTL
=
"gnustl_shared_4
9
"
# Set up android build environment and set ANDROID_BUILD_OPTS array
android_build_env
...
...
This diff is collapsed.
Click to expand it.
builds/android/ci_build.sh
View file @
dc40c95c
#!/usr/bin/env bash
NDK_VER
=
android-ndk-r10e
NDK_VER
=
android-ndk-r11c
NDK_ABI_VER
=
4.9
if
[
$TRAVIS_OS_NAME
==
"linux"
]
then
...
...
@@ -13,17 +14,16 @@ else
exit
1
fi
export
FILENAME
=
$NDK_VER
-
$NDK_PLATFORM
.
bin
export
FILENAME
=
$NDK_VER
-
$NDK_PLATFORM
.
zip
(
cd
'/tmp'
\
&&
wget http://dl.google.com/android/ndk/
$FILENAME
\
&&
chmod
a+x
$FILENAME
\
&&
./
$FILENAME
&> /dev/null
)
||
exit
1
&&
wget http://dl.google.com/android/repository/
$FILENAME
\
&&
unzip
$FILENAME
&> /dev/null
)
||
exit
1
unset
FILENAME
export
ANDROID_NDK_ROOT
=
"/tmp/
$NDK_VER
"
export
TOOLCHAIN_PATH
=
"
$ANDROID_NDK_ROOT
/toolchains/arm-linux-androideabi-
4.8
/prebuilt/
$NDK_PLATFORM
/bin"
export
TOOLCHAIN_NAME
=
"arm-linux-androideabi-
4.8
"
export
TOOLCHAIN_PATH
=
"
$ANDROID_NDK_ROOT
/toolchains/arm-linux-androideabi-
$NDK_ABI_VER
/prebuilt/
$NDK_PLATFORM
/bin"
export
TOOLCHAIN_NAME
=
"arm-linux-androideabi-
$NDK_ABI_VER
"
export
TOOLCHAIN_HOST
=
"arm-linux-androideabi"
export
TOOLCHAIN_ARCH
=
"arm"
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment