x86_64 emulator

JDAI-CV · May 23, 2019 · db6c783 · db6c783
1 parent e835863
commit db6c783
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ci/build_dnnlibrary.sh b/ci/build_dnnlibrary.sh
@@ -5,6 +5,6 @@ echo "y" | $ANDROID_HOME/tools/bin/sdkmanager --install 'ndk-bundle'
 nproc=$(ci/get_cores.sh)
 
 mkdir build_dnnlibrary && pushd build_dnnlibrary
-cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_HOME/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=android-27 -DANDROID_ABI=arm64-v8a -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Release -DDNN_READ_ONNX=ON ..
+cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_HOME/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=android-27 -DANDROID_ABI=x86_64 -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Release -DDNN_READ_ONNX=ON ..
 cmake --build . -- -j$nproc
 popd
diff --git a/ci/start_android_emulator.sh b/ci/start_android_emulator.sh
@@ -3,9 +3,9 @@ set -e
 
 export TERM=xterm
 
-echo "y" | $ANDROID_HOME/tools/bin/sdkmanager --install 'system-images;android-25;google_apis;arm64-v8a'
+echo "y" | $ANDROID_HOME/tools/bin/sdkmanager --install 'system-images;android-28;google_apis;x86_64'
 
-echo "no" | $ANDROID_HOME/tools/bin/avdmanager create avd -n android_emulator -k 'system-images;android-25;google_apis;arm64-v8a' --force
+echo "no" | $ANDROID_HOME/tools/bin/avdmanager create avd -n android_emulator -k 'system-images;android-28;google_apis;x86_64' --force
 
 echo "Starting emulator"