sigrok-cross-android: Use /sdcard/sigrok-firmware for firmwares

[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 f270f1462192ef854f8d28b540d18b3918f51707..43355fbea0ab0d8f695e583d538799f07fa56ff6 100755 (executable)
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -240,7 +240,7 @@ cd ..
 $GIT_CLONE git://sigrok.org/libsigrok
 cd libsigrok
 ./autogen.sh
-./configure $C
+./configure $C --datadir=/sdcard
 make $PARALLEL V=1
 make install
 cd ..
@@ -318,12 +318,11 @@ cd pulseview
 patch -p1 < ../../pulseview-cpp.patch
 cmake $CM -DANDROID_STL_PATH=${ANDROID_NDK}/sources/cxx-stl .
 make $PARALLEL
-cp -r "$PREFIX"/src/android/java .
+git clone https://github.com/zeldin/pulseview_android_java 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/
 cp "$PREFIX"/jar/QtAndroidAccessibility-bundled.jar libs/
 mkdir -p assets