X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=cross-compile%2Fandroid%2Fsigrok-cross-android;h=f802a5d7b977a85ac59f11e5f231fe7fe9fc4b68;hb=621e2e6eaa182ed9c0c2fa5b3818387e39dfe8c9;hp=93b3871f317acf1e4adec131febaeab23026f037;hpb=7d3d2c0cdc60b8e7c88a2a29289aa14d775af81d;p=sigrok-util.git

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 93b3871..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
@@ -90,9 +90,7 @@ tar xJf Python-$VER_PYTHON.tar.xz
 cd Python-$VER_PYTHON
 ./configure
 make python $PARALLEL
-make Parser/pgen $PARALLEL
 mv python hostpython
-mv Parser/pgen Parser/hostpgen
 cd ..
 
 # -----------------------------------------------------------------------------
@@ -124,7 +122,7 @@ autoreconf
 patch -p1 < ../../Python-$VER_PYTHON.patch
 ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no ac_cv_func_pipe2=no ac_cv_func_fdatasync=no ac_cv_func_killpg=no ac_cv_func_waitid=no ac_cv_func_sigaltstack=no ./configure $C --build=x86_64-linux-gnu --disable-ipv6
 sed -i "s/^#zlib/zlib/g" Modules/Setup
-make HOSTPYTHON=./hostpython HOSTPGEN=./Parser/hostpgen install $PARALLEL
+make PYTHON_FOR_BUILD=./hostpython install $PARALLEL
 cd ..
 
 # libiconv (needed for glib)
@@ -312,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}"
@@ -321,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