diff options
Diffstat (limited to 'scripts/travis')
-rwxr-xr-x | scripts/travis | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/scripts/travis b/scripts/travis index 84f3f19..a18f58c 100755 --- a/scripts/travis +++ b/scripts/travis | |||
@@ -97,23 +97,9 @@ elif [ "x$ARCH" = "xarm32" -o "x$ARCH" = "xarm64" ]; then | |||
97 | file apps/openssl/.libs/openssl | 97 | file apps/openssl/.libs/openssl |
98 | 98 | ||
99 | elif [ "x$ARCH" = "xandroid" ]; then | 99 | elif [ "x$ARCH" = "xandroid" ]; then |
100 | touch $HOME/.android/repositories.cfg | 100 | sudo apt-get update |
101 | echo "##### Date: `date` install NDK and build tools" | 101 | sudo apt-get install -y cmake ninja-build |
102 | echo y | sdkmanager 'platforms;android-30' > /dev/null 2>&1 | 102 | |
103 | echo "##### Date: `date` platforms;android installed" | ||
104 | echo y | sdkmanager 'ndk-bundle' > /dev/null 2>&1 | ||
105 | echo "##### Date: `date` ndk-bundle installed" | ||
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 | ||
116 | export ANDROID_NDK_HOME=$ANDROID_HOME/ndk-bundle | ||
117 | export TC_FILE=$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake | 103 | export TC_FILE=$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake |
118 | 104 | ||
119 | # set target API level and architecture | 105 | # set target API level and architecture |
@@ -143,12 +129,12 @@ elif [ "x$ARCH" = "xandroid" ]; then | |||
143 | rm -fr $build_dir | 129 | rm -fr $build_dir |
144 | mkdir $build_dir | 130 | mkdir $build_dir |
145 | cd $build_dir | 131 | cd $build_dir |
146 | $CMAKE -GNinja -DCMAKE_MAKE_PROGRAM=$NINJA \ | 132 | cmake -GNinja -DCMAKE_MAKE_PROGRAM=ninja \ |
147 | -DANDROID_NDK=$ANDROID_NDK_HOME \ | 133 | -DANDROID_NDK=$ANDROID_NDK_HOME \ |
148 | -DCMAKE_TOOLCHAIN_FILE=$TC_FILE \ | 134 | -DCMAKE_TOOLCHAIN_FILE=$TC_FILE \ |
149 | -DANDROID_ABI=$ABI -DANDROID_NATIVE_API_LEVEL=$NAL .. | 135 | -DANDROID_ABI=$ABI -DANDROID_NATIVE_API_LEVEL=$NAL .. |
150 | 136 | ||
151 | $NINJA -j 4 | 137 | ninja -j 4 |
152 | 138 | ||
153 | echo "" | 139 | echo "" |
154 | file apps/openssl/openssl | 140 | file apps/openssl/openssl |