diff options
author | kinichiro <kinichiro.inoguchi@gmail.com> | 2021-05-09 15:57:23 +0900 |
---|---|---|
committer | kinichiro <kinichiro.inoguchi@gmail.com> | 2021-05-09 21:33:32 +0900 |
commit | e8bbbabcc94e43b6d1d1266293bf2ea0a7bb6541 (patch) | |
tree | 414d25d50eaa3a6fab83d35832dadb31cc970134 /scripts | |
parent | 6f38fb483cf0bf0f4112b23d9971aa51917e1910 (diff) | |
download | portable-e8bbbabcc94e43b6d1d1266293bf2ea0a7bb6541.tar.gz portable-e8bbbabcc94e43b6d1d1266293bf2ea0a7bb6541.tar.bz2 portable-e8bbbabcc94e43b6d1d1266293bf2ea0a7bb6541.zip |
Fix Android CI
- Targeted to Android 8.0 (API level 26) and above
- Build for x86_64, x86 and arm64-v8a, stop searching dir for detecting ABI
- Use newer version of ndk and cmake
- Suppress sdkmanager messages to reduce log output
- Add log messages to tell CI running right
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/travis | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/scripts/travis b/scripts/travis index 5c2f6ad..84f3f19 100755 --- a/scripts/travis +++ b/scripts/travis | |||
@@ -98,39 +98,38 @@ elif [ "x$ARCH" = "xarm32" -o "x$ARCH" = "xarm64" ]; then | |||
98 | 98 | ||
99 | elif [ "x$ARCH" = "xandroid" ]; then | 99 | elif [ "x$ARCH" = "xandroid" ]; then |
100 | touch $HOME/.android/repositories.cfg | 100 | touch $HOME/.android/repositories.cfg |
101 | echo y | sdkmanager 'ndk-bundle' | 101 | echo "##### Date: `date` install NDK and build tools" |
102 | echo y | sdkmanager 'ndk;20.1.5948944' | 102 | echo y | sdkmanager 'platforms;android-30' > /dev/null 2>&1 |
103 | echo y | sdkmanager 'cmake;3.6.4111459' | 103 | echo "##### Date: `date` platforms;android installed" |
104 | 104 | echo y | sdkmanager 'ndk-bundle' > /dev/null 2>&1 | |
105 | export CMAKE=$ANDROID_HOME/cmake/3.6.4111459/bin/cmake | 105 | echo "##### Date: `date` ndk-bundle installed" |
106 | export NINJA=$ANDROID_HOME/cmake/3.6.4111459/bin/ninja | 106 | echo y | sdkmanager 'ndk;22.1.7171670' |
107 | echo "##### Date: `date` ndk installed" | ||
108 | echo y | sdkmanager 'cmake;3.18.1' | ||
109 | echo "##### Date: `date` cmake installed" | ||
110 | |||
111 | echo "##### Date: `date` sdkmanager --list" | ||
112 | sdkmanager --list | ||
113 | |||
114 | export CMAKE=$ANDROID_HOME/cmake/3.18.1/bin/cmake | ||
115 | export NINJA=$ANDROID_HOME/cmake/3.18.1/bin/ninja | ||
107 | export ANDROID_NDK_HOME=$ANDROID_HOME/ndk-bundle | 116 | export ANDROID_NDK_HOME=$ANDROID_HOME/ndk-bundle |
108 | export TC_FILE=$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake | 117 | export TC_FILE=$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake |
109 | 118 | ||
110 | # get available API level and architecture | 119 | # set target API level and architecture |
111 | pdir=$ANDROID_NDK_HOME/platforms | ||
112 | level_arch="" | 120 | level_arch="" |
113 | level=$MIN_NAL | 121 | level=$MIN_NAL |
114 | while [ $level -le $MAX_NAL ] | 122 | while [ $level -le $MAX_NAL ] |
115 | do | 123 | do |
116 | if [ -d $pdir/android-$level ] ; then | 124 | level_arch="$level_arch $level;x86_64" |
117 | adir=$pdir/android-$level | 125 | level_arch="$level_arch $level;x86" |
118 | if [ -d $adir/arch-arm ] ; then | 126 | level_arch="$level_arch $level;arm64-v8a" |
119 | level_arch="$level_arch $level;armeabi-v7a" | 127 | |
120 | fi | ||
121 | if [ -d $adir/arch-arm64 ] ; then | ||
122 | level_arch="$level_arch $level;arm64-v8a" | ||
123 | fi | ||
124 | if [ -d $adir/arch-x86 ] ; then | ||
125 | level_arch="$level_arch $level;x86" | ||
126 | fi | ||
127 | if [ -d $adir/arch-x86_64 ] ; then | ||
128 | level_arch="$level_arch $level;x86_64" | ||
129 | fi | ||
130 | fi | ||
131 | level=`expr $level + 1` | 128 | level=`expr $level + 1` |
132 | done | 129 | done |
133 | 130 | ||
131 | echo "##### level_arch = $level_arch" | ||
132 | |||
134 | # build each API level and architecture | 133 | # build each API level and architecture |
135 | for la in $level_arch | 134 | for la in $level_arch |
136 | do | 135 | do |