X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fandroid%2Fsigrok-cross-android;h=f802a5d7b977a85ac59f11e5f231fe7fe9fc4b68;hp=89359d33cf29cd1486103d814a3c409f76a1358e;hb=621e2e6eaa182ed9c0c2fa5b3818387e39dfe8c9;hpb=8ea8be54f6e45f2218c6a5885056bac996854928 diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android index 89359d3..f802a5d 100755 --- a/cross-compile/android/sigrok-cross-android +++ b/cross-compile/android/sigrok-cross-android @@ -22,10 +22,10 @@ set -e # The path where Android NDK is located. -ANDROID_NDK=/usr/local/android-ndk-r9d +ANDROID_NDK=$HOME/android/android-ndk-r9d # The path where Android SDK is located. -ANDROID_SDK=/usr/local/android +ANDROID_SDK=$HOME/android/android-sdk-linux # The path where your Android toolchain directory is located. TOOLCHAIN=$HOME/android/android-arm-toolchain @@ -310,7 +310,7 @@ make install cd .. # sigrok-androidutils -$GIT_CLONE git://github.com/zeldin/sigrok-androidutils +$GIT_CLONE git://sigrok.org/sigrok-androidutils cd sigrok-androidutils ./autogen.sh ./configure $C --with-android-sdk="${ANDROID_SDK}" @@ -319,8 +319,7 @@ make install cd .. # PulseView -$GIT_CLONE -b android git://github.com/zeldin/pulseview -# $GIT_CLONE git://sigrok.org/pulseview +$GIT_CLONE git://sigrok.org/pulseview cd pulseview cmake $CM -DANDROID_STL_PATH=${ANDROID_NDK}/sources/cxx-stl . make $PARALLEL