mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1442 from dneto0/use-forked-android-ndk-repo

Browse Source 
NDK build: Use NDK r17b and its own CMake toolchain file
This commit is contained in:
John Kessenich 2018-07-12 15:07:51 -07:00 committed by GitHub
commit 806af25f74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.travis.yml
View File

@ -48,20 +48,16 @@ install:
- if [[ "$TRAVIS_OS_NAME" == "linux" && "$CC" == "clang" ]]; then - if [[ "$TRAVIS_OS_NAME" == "linux" && "$CC" == "clang" ]]; then
export CC=clang-3.6 CXX=clang++-3.6; export CC=clang-3.6 CXX=clang++-3.6;
fi fi
# Download Android NDK and Android CMake toolchain file. # Download a recent Android NDK and use its android.toolchain.cmake file.
# Unfortunately the android.toolchain.cmake file does not understand how to
# get the API level from Android NDK r17b. So fall back on r13b.
# Get only one commit at tag r13b.
- if [[ "$BUILD_NDK" == "ON" ]]; then - if [[ "$BUILD_NDK" == "ON" ]]; then
export ANDROID_NDK=$HOME/android-ndk; export ANDROID_NDK=$HOME/android-ndk;
git init $ANDROID_NDK; git init $ANDROID_NDK;
pushd $ANDROID_NDK; pushd $ANDROID_NDK;
git remote add urho3d https://github.com/urho3d/android-ndk.git; git remote add dneto0 https://github.com/dneto0/android-ndk.git;
git fetch --depth=1 urho3d r13b; git fetch --depth=1 dneto0 r17b-strip;
git checkout FETCH_HEAD; git checkout FETCH_HEAD;
popd; popd;
git clone --depth=1 https://github.com/taka-no-me/android-cmake.git $HOME/android-cmake; export TOOLCHAIN_PATH=$ANDROID_NDK/build/cmake/android.toolchain.cmake;
export TOOLCHAIN_PATH=$HOME/android-cmake/android.toolchain.cmake;
fi fi
before_script: before_script:
@ -71,10 +67,12 @@ before_script:
script: script:
- mkdir build && cd build - mkdir build && cd build
# For Android, do release building using NDK without testing. # For Android, do release building using NDK without testing.
# Use android-14, the oldest native API level supporeted by NDK r17b.
# We can use newer API levels if we want.
# For Linux and macOS, do debug/release building with testing. # For Linux and macOS, do debug/release building with testing.
- if [[ "$BUILD_NDK" == "ON" ]]; then - if [[ "$BUILD_NDK" == "ON" ]]; then
cmake -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_PATH} cmake -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_PATH}
-DANDROID_NATIVE_API_LEVEL=android-12 -DANDROID_NATIVE_API_LEVEL=android-14
-DCMAKE_BUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release
-DANDROID_ABI="armeabi-v7a with NEON" -DANDROID_ABI="armeabi-v7a with NEON"
-DBUILD_TESTING=OFF ..; -DBUILD_TESTING=OFF ..;