|
230 | 230 | cmake "$DIR/../Release/" \
|
231 | 231 | -DCMAKE_TOOLCHAIN_FILE=../android-cmake/android.toolchain.cmake \
|
232 | 232 | -DANDROID_ABI=armeabi-v7a \
|
233 |
| - -DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-clang3.4 \ |
| 233 | + -DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-clang3.6 \ |
234 | 234 | -DANDROID_STL=none \
|
235 | 235 | -DANDROID_STL_FORCE_FEATURES=ON \
|
236 | 236 | -DANDROID_NATIVE_API_LEVEL=android-9 \
|
|
246 | 246 | cmake "$DIR/../Release/" \
|
247 | 247 | -DCMAKE_TOOLCHAIN_FILE=../android-cmake/android.toolchain.cmake \
|
248 | 248 | -DANDROID_ABI=armeabi-v7a \
|
249 |
| - -DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-clang3.4 \ |
| 249 | + -DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-clang3.6 \ |
250 | 250 | -DANDROID_STL=none \
|
251 | 251 | -DANDROID_STL_FORCE_FEATURES=ON \
|
252 | 252 | -DANDROID_NDK="${ANDROID_NDK}" \
|
|
262 | 262 | cmake "$DIR/../Release/" \
|
263 | 263 | -DCMAKE_TOOLCHAIN_FILE=../android-cmake/android.toolchain.cmake \
|
264 | 264 | -DANDROID_ABI=x86 \
|
265 |
| - -DANDROID_TOOLCHAIN_NAME=x86-clang3.4 \ |
| 265 | + -DANDROID_TOOLCHAIN_NAME=x86-clang3.6 \ |
266 | 266 | -DANDROID_STL=none \
|
267 | 267 | -DANDROID_STL_FORCE_FEATURES=ON \
|
268 | 268 | -DANDROID_NATIVE_API_LEVEL=android-9 \
|
|
278 | 278 | cmake "$DIR/../Release/" \
|
279 | 279 | -DCMAKE_TOOLCHAIN_FILE=../android-cmake/android.toolchain.cmake \
|
280 | 280 | -DANDROID_ABI=x86 \
|
281 |
| - -DANDROID_TOOLCHAIN_NAME=x86-clang3.4 \ |
| 281 | + -DANDROID_TOOLCHAIN_NAME=x86-clang3.6 \ |
282 | 282 | -DANDROID_STL=none \
|
283 | 283 | -DANDROID_STL_FORCE_FEATURES=ON \
|
284 | 284 | -DANDROID_NDK="${ANDROID_NDK}" \
|
|
0 commit comments