sigrok-cross-android: Add Qt5Svg to PV libraries

[sigrok-util.git] / cross-compile / android / sigrok-cross-android

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 76e149b64388a1872f4d43752627af66f3b61ab2..f270f1462192ef854f8d28b540d18b3918f51707 100755 (executable)
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -297,7 +297,7 @@ $WGET http://$SF_MIRROR/project/boost/boost/$VER_BOOST/boost_${VER_BOOST//./_}.t
 tar xfj boost_${VER_BOOST//./_}.tar.bz2
 cd boost_${VER_BOOST//./_}
 patch -p1 < ../../boost.patch
-./bootstrap.sh --with-toolset=gcc --with-libraries=filesystem,system,thread --without-icu
+./bootstrap.sh --with-toolset=gcc --with-libraries=filesystem,system --without-icu
 echo "using gcc : $NDK_TOOLCHAIN_VERSION : \"${TOOLCHAIN_TRIPLET}-g++\" : <cxxflags>\"-I$PREFIX/include -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${NDK_TOOLCHAIN_VERSION}/include -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${NDK_TOOLCHAIN_VERSION}/libs/${TARGET_ARCH}/include\" <linkflags>\"-L$PREFIX/lib -L${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${NDK_TOOLCHAIN_VERSION}/libs/${TARGET_ARCH} -lgnustl_shared\" ;" > user-config.jam
 ./b2 -q -d+2 --user-config=user-config.jam toolset=gcc variant=release link=shared threading=multi runtime-link=shared target-os=android --prefix=$PREFIX --layout=system install
 cd ..
@@ -320,6 +320,8 @@ cmake $CM -DANDROID_STL_PATH=${ANDROID_NDK}/sources/cxx-stl .
 make $PARALLEL
 cp -r "$PREFIX"/src/android/java .
 cp -r libs java/
+mkdir -p java/res/drawable
+cp icons/sigrok-logo-notext.png java/res/drawable/logo.png
 cd java
 patch -p2 < ../../../pulseview-java.patch
 cp "$PREFIX"/jar/QtAndroid-bundled.jar libs/