From b0c22e7a3a965bad6dc653111c1b12483bcfcda5 Mon Sep 17 00:00:00 2001 From: matlabbe Date: Mon, 8 May 2017 13:23:38 -0400 Subject: [PATCH] Docker: fixed armeabi-v7a copy to arm64-v8a --- docker/xenial/android/tango/build.bash | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/xenial/android/tango/build.bash b/docker/xenial/android/tango/build.bash index 0d3fd888..84adda20 100644 --- a/docker/xenial/android/tango/build.bash +++ b/docker/xenial/android/tango/build.bash @@ -6,6 +6,7 @@ git clone https://github.com/introlab/rtabmap.git rtabmap-tango # tango wget https://developers.google.com/tango/downloads/TangoSDK_Hopak_C.zip unzip -qq TangoSDK_Hopak_C.zip +rm TangoSDK_Hopak_C.zip cp -r lib_tango_client_api/include/* /opt/android/armeabi-v7a/include/. cp -r lib_tango_client_api/include/* /opt/android/arm64-v8a/include/. cp -r lib_tango_client_api/lib/armeabi-v7a/* /opt/android/armeabi-v7a/lib/. @@ -13,6 +14,7 @@ cp -r lib_tango_client_api/lib/arm64-v8a/* /opt/android/arm64-v8a/lib/. rm -r lib_tango_client_api wget https://developers.google.com/tango/downloads/TangoSupport_Hopak_C.zip unzip -qq TangoSupport_Hopak_C.zip +rm TangoSupport_Hopak_C.zip cp -r lib_tango_support_api/include/* /opt/android/armeabi-v7a/include/. cp -r lib_tango_support_api/include/* /opt/android/arm64-v8a/include/. cp -r lib_tango_support_api/lib/armeabi-v7a/* /opt/android/armeabi-v7a/lib/. @@ -35,5 +37,5 @@ cmake -DCMAKE_TOOLCHAIN_FILE=../../cmake_modules/android.toolchain.cmake -DANDRO make # package with binaries of both architectures -cp ../armeabi-v7a/app/android/libs/armeabi-v7a/libNativeRTABMap.so app/android/libs/armeabi-v7a/libNativeRTABMap.so +cp -r ../armeabi-v7a/app/android/libs/armeabi-v7a app/android/libs/armeabi-v7a make \ No newline at end of file