docker: updated tango-api19 image

This commit is contained in:
matlabbe
2020-07-10 15:26:59 -04:00
parent bf45a0cba2
commit 43eba76a20
3 changed files with 8 additions and 24 deletions

View File

@@ -1,4 +1,4 @@
# Image: introlab3it/rtabmap:android-deps # Image: introlab3it/rtabmap:android-deps-api19
FROM ubuntu:16.04 FROM ubuntu:16.04

View File

@@ -1,6 +1,6 @@
# Image: introlab3it/rtabmap:tango # Image: introlab3it/rtabmap:tango-api19
FROM introlab3it/rtabmap:android-deps FROM introlab3it/rtabmap:android-deps-api19
WORKDIR /root/ WORKDIR /root/

View File

@@ -31,38 +31,22 @@ rm -r lib_tango_support_api
wget 'https://docs.google.com/uc?authuser=0&id=1s5iPJ7xiridj9Jj--gCy2XiQFniheVm6&export=download' -O TangoSDK_Ikariotikos_Java.jar wget 'https://docs.google.com/uc?authuser=0&id=1s5iPJ7xiridj9Jj--gCy2XiQFniheVm6&export=download' -O TangoSDK_Ikariotikos_Java.jar
mv TangoSDK_Ikariotikos_Java.jar rtabmap-tango/app/android/libs/. mv TangoSDK_Ikariotikos_Java.jar rtabmap-tango/app/android/libs/.
# ARCore # Patch to remove not supported arcore and arengine stuff on API19
wget 'https://docs.google.com/uc?authuser=0&id=1A4gMviyxHCnA19MTMbitOWoSOyoZcCef&export=download' -O arcore.zip cd rtabmap-tango
unzip -qq arcore.zip git pull origin tango-api19
rm arcore.zip
cp arcore/*.jar rtabmap-tango/app/android/libs/.
rm -r arcore
# AREngine
wget 'https://docs.google.com/uc?authuser=0&id=1rdaD2Z1QBv-SUeUy0oBmg3C2odfxTHgR&export=download' -O arengine.zip
unzip -qq arengine.zip
rm arengine.zip
cp arengine/*.jar rtabmap-tango/app/android/libs/.
rm -r arengine
# resource tool # resource tool
cd rtabmap-tango/build cd build
cmake -DANDROID_PREBUILD=ON .. cmake -DANDROID_PREBUILD=ON ..
make make
cd ../.. cd ../..
# rtabmap # rtabmap (do only 32 bits for api19)
mkdir rtabmap-tango/build/armeabi-v7a mkdir rtabmap-tango/build/armeabi-v7a
cd rtabmap-tango/build/armeabi-v7a cd rtabmap-tango/build/armeabi-v7a
cmake -DCMAKE_TOOLCHAIN_FILE=../../cmake_modules/android.toolchain.cmake -DANDROID_ABI=armeabi-v7a -DBUILD_SHARED_LIBS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_TOOLS=OFF -DCMAKE_BUILD_TYPE=Release -DOpenCV_DIR=$prefix/armeabi-v7a/sdk/native/jni -DCMAKE_INSTALL_PREFIX=$prefix/armeabi-v7a ../.. cmake -DCMAKE_TOOLCHAIN_FILE=../../cmake_modules/android.toolchain.cmake -DANDROID_ABI=armeabi-v7a -DBUILD_SHARED_LIBS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_TOOLS=OFF -DCMAKE_BUILD_TYPE=Release -DOpenCV_DIR=$prefix/armeabi-v7a/sdk/native/jni -DCMAKE_INSTALL_PREFIX=$prefix/armeabi-v7a ../..
make make
cd ../../..
mkdir rtabmap-tango/build/arm64-v8a
cd rtabmap-tango/build/arm64-v8a
cmake -DCMAKE_TOOLCHAIN_FILE=../../cmake_modules/android.toolchain.cmake -DANDROID_ABI=arm64-v8a -DBUILD_SHARED_LIBS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_TOOLS=OFF -DCMAKE_BUILD_TYPE=Release -DOpenCV_DIR=$prefix/arm64-v8a/sdk/native/jni -DCMAKE_INSTALL_PREFIX=$prefix/arm64-v8a ../..
make
# package with binaries of both architectures # package with binaries of both architectures
cp -r ../armeabi-v7a/app/android/libs/armeabi-v7a app/android/libs/. cp -r ../armeabi-v7a/app/android/libs/armeabi-v7a app/android/libs/.
make make