root
/
MNN
mirror of https://github.com/alibaba/MNN.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[PATCH 3/5] [CI:Bugfix] Fix sh bug for android

This commit is contained in:
xiaying 2020-04-13 14:00:46 +08:00 committed by xiaying
parent d0edf77e63
commit 4266c95a06
5 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ciscripts/Android/32.sh
View File

@ -1,4 +1,17 @@
./schema/generate.sh
cd project/android
mkdir build_32
cd build_32
../build_32.sh -DMNN_VULKAN=ON -DMNN_OPENMP=OFF -DMNN_USE_THREAD_POOL=ON
cmake ../../../ \
-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake \
-DCMAKE_BUILD_TYPE=Release \
-DANDROID_ABI="armeabi-v7a" \
-DANDROID_STL=c++_static \
-DCMAKE_BUILD_TYPE=Release \
-DANDROID_NATIVE_API_LEVEL=android-14 \
-DANDROID_TOOLCHAIN=clang \
-DMNN_USE_LOGCAT=true \
-DMNN_BUILD_FOR_ANDROID_COMMAND=true \
-DNATIVE_LIBRARY_OUTPUT=. -DNATIVE_INCLUDE_OUTPUT=. -DMNN_VULKAN=ON -DMNN_OPENCL=ON -DMNN_USE_THREAD_POOL=ON
make -j4

1
ciscripts/Android/32OMP.sh
View File

@ -1,3 +1,4 @@
./schema/generate.sh
cd project/android
mkdir build_32
cd build_32

16
ciscripts/Android/64.sh
View File

@ -1,4 +1,18 @@
./schema/generate.sh
cd project/android
mkdir build_64
cd build_64
../build_64.sh -DMNN_VULKAN=ON -DMNN_OPENMP=OFF -DMNN_USE_THREAD_POOL=ON
cmake ../../../ \
-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake \
-DCMAKE_BUILD_TYPE=Release \
-DANDROID_ABI="arm64-v8a" \
-DANDROID_STL=c++_static \
-DCMAKE_BUILD_TYPE=Release \
-DANDROID_NATIVE_API_LEVEL=android-21 \
-DANDROID_TOOLCHAIN=clang \
-DMNN_USE_LOGCAT=true \
-DMNN_BUILD_FOR_ANDROID_COMMAND=true \
-DNATIVE_LIBRARY_OUTPUT=. -DNATIVE_INCLUDE_OUTPUT=. \
-DMNN_VULKAN=ON -DMNN_OPENCL=ON -DMNN_ARM82=ON
make -j4

1
ciscripts/Android/64OMP.sh
View File

@ -1,3 +1,4 @@
./schema/generate.sh
cd project/android
mkdir build_64
cd build_64

1
ciscripts/Android/Gradle.sh
View File

@ -1,3 +1,4 @@
./schema/generate.sh
cd project/android/
./gradlew assembleRelease
if [[ -z "${DEPLOY_ENV}" ]]; then