i/rtabmap_ros
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap_ros.git synced 2026-10-04 08:47:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Docker: added opencv2 android, tango now linking on opencv2 (fixing gftt/brief not available)

Browse Source
This commit is contained in:
matlabbe
2017-05-23 14:20:32 -04:00
parent 87a5f69335
commit 392ae832b8
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/xenial/android/install_deps.bash
+8 -2
View File
@@ -134,8 +134,14 @@ cd
rm -r pcl rm -r pcl
# OpenCV # OpenCV
echo "wget opencv..." echo "wget opencv3..."
wget -nv https://downloads.sourceforge.net/project/opencvlibrary/opencv-android/3.2.0/opencv-3.2.0-android-sdk.zip wget -nv https://downloads.sourceforge.net/project/opencvlibrary/opencv-android/3.2.0/opencv-3.2.0-android-sdk.zip
unzip -qq opencv-3.2.0-android-sdk.zip unzip -qq opencv-3.2.0-android-sdk.zip
rm opencv-3.2.0-android-sdk.zip rm opencv-3.2.0-android-sdk.zip
mv OpenCV-android-sdk /opt/. mv OpenCV-android-sdk /opt/OpenCV3-android-sdk
echo "wget opencv2..."
wget -nv https://downloads.sourceforge.net/project/opencvlibrary/opencv-android/2.4.13/opencv-2.4.13.2-android-sdk.zip
unzip -qq opencv-2.4.13.2-android-sdk.zip
rm opencv-2.4.13.2-android-sdk.zip
mv OpenCV-android-sdk /opt/OpenCV2-android-sdk
docker/xenial/android/tango/build.bash
+2 -2
View File
@@ -27,13 +27,13 @@ mv TangoSDK_Hopak_Java.jar rtabmap-tango/app/android/libs/.
# rtabmap # rtabmap
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=/opt/OpenCV-android-sdk/sdk/native/jni -DCMAKE_INSTALL_PREFIX=/opt/android/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=/opt/OpenCV2-android-sdk/sdk/native/jni -DCMAKE_INSTALL_PREFIX=/opt/android/armeabi-v7a ../..
make make
cd cd
mkdir rtabmap-tango/build/arm64-v8a mkdir rtabmap-tango/build/arm64-v8a
cd 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=/opt/OpenCV-android-sdk/sdk/native/jni -DCMAKE_INSTALL_PREFIX=/opt/android/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=/opt/OpenCV2-android-sdk/sdk/native/jni -DCMAKE_INSTALL_PREFIX=/opt/android/arm64-v8a ../..
make make
# package with binaries of both architectures # package with binaries of both architectures