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
b872e7d9
Commit
b872e7d9
authored
8 years ago
by
Luca Boccassi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Problem: Android CI NDK version out of date
Solution: update CI scripts to use newer r11c from r10e
parent
8be56891
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
android_build_helper.sh
builds/android/android_build_helper.sh
+2
-2
ci_build.sh
builds/android/ci_build.sh
+4
-5
No files found.
builds/android/android_build_helper.sh
View file @
b872e7d9
...
...
@@ -75,12 +75,12 @@ 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.8/prebuilt/linux-x86_64/bin
\"
)"
)
fi
if
[
-z
"
$TOOLCHAIN_NAME
"
]
;
then
...
...
This diff is collapsed.
Click to expand it.
builds/android/ci_build.sh
View file @
b872e7d9
#!/usr/bin/env bash
NDK_VER
=
android-ndk-r1
0e
NDK_VER
=
android-ndk-r1
1c
NDK_ABI_VER
=
4.9
if
[
$TRAVIS_OS_NAME
==
"linux"
]
...
...
@@ -14,12 +14,11 @@ 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
"
...
...
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