From: Marcus Comstedt <redacted>
Date: Tue, 15 Jul 2014 22:16:10 +0000 (+0200)
Subject: sigrok-cross-android: Remove PV setup now handled by ant
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=1238f785c12e5c7558178d57d2659f92b10485c8;p=sigrok-util.git

sigrok-cross-android: Remove PV setup now handled by ant
---

diff --git a/cross-compile/android/fix-libraries.sh b/cross-compile/android/fix-libraries.sh
deleted file mode 100755
index 8d14940..0000000
--- a/cross-compile/android/fix-libraries.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/sh
-
-set -e
-tmpdir=/tmp/fixlib$$
-trap 'rm -rf "$tmpdir"' 0 1 2 3 15
-mkdir -p "$tmpdir"
-
-if [ $# -lt 3 ]; then
-  echo >&2 "Usage: $0 srclib destlib library ..."
-  exit 1
-fi
-
-: ${READELF=readelf}
-
-srclib="$1"
-destlib="$2"
-shift
-shift
-rm -f "$tmpdir"/todo
-touch "$tmpdir"/todo
-for lib; do
-  echo "$lib" >> "$tmpdir"/todo
-done
-
-process()
-{
-  libname="$1"
-  libfile="$destlib"/"$libname"
-  if [ ! -f "$libfile" ]; then
-    echo >&2 "$libfile not found"
-    exit 1
-  fi
-  "$READELF" -d "$libfile" | awk '$1=="0x00000001" {print $NF}' | tr -d '][' | grep '\.so\.' | sort >> "$tmpdir"/worklist
-}
-
-install()
-{
-  libname="$1"
-  libfile=`echo "$libname" | sed -e 's/\.so\..*/.so/'`
-  cp "$srclib"/"$libname" "$destlib"/"$libfile"
-  echo "$libfile" >> "$tmpdir"/worklist
-  for deplib in `"$READELF" -d "$destlib"/"$libfile" | awk '$1=="0x00000001" {print $NF}' | tr -d '][' | grep '\.so\.' | sort`; do
-    echo "$deplib $libname"  >> "$tmpdir"/liblist
-  done
-}
-
-rm -f "$tmpdir"/liblist
-touch "$tmpdir"/liblist
-sort "$tmpdir"/todo > "$tmpdir"/processed
-while [ -s "$tmpdir"/todo ]; do
-  rm -f "$tmpdir"/worklist
-  touch "$tmpdir"/worklist
-  cat "$tmpdir"/todo | while read lib; do
-    if [ ! -z "$lib" ]; then
-      process "$lib"
-    fi
-  done
-  sort "$tmpdir"/worklist | uniq > "$tmpdir"/todo.tmp
-  comm -13 "$tmpdir"/processed "$tmpdir"/todo.tmp > "$tmpdir"/todo
-  sort -m "$tmpdir"/processed "$tmpdir"/todo | uniq > "$tmpdir"/processed.tmp
-  mv "$tmpdir"/processed.tmp "$tmpdir"/processed
-  rm -f "$tmpdir"/worklist
-  touch "$tmpdir"/worklist
-  cat "$tmpdir"/todo | while read lib; do
-    if [ ! -z "$lib" ]; then
-      install "$lib"
-    fi
-  done
-  mv "$tmpdir"/worklist "$tmpdir"/todo
-done
-tsort "$tmpdir"/liblist
diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 2e4cb8d..538b690 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -317,16 +317,8 @@ cd pulseview
 patch -p1 < ../../pulseview-cpp.patch
 cmake $CM -DANDROID_STL_PATH=${ANDROID_NDK}/sources/cxx-stl .
 make $PARALLEL
-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
-mkdir -p assets
-READELF=$TOOLCHAIN_TRIPLET-readelf ../../../fix-libraries.sh "$PREFIX/lib" libs/"$TARGET_ARCH" libpulseview.so > assets/liblist.txt
-(cd "$PREFIX"/lib && find python3.3 -name '*.py' | cpio -o) | (cd assets && cpio -id)
-cp -r "$PREFIX"/share/libsigrokdecode assets/
-cp ${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${NDK_TOOLCHAIN_VERSION}/libs/${TARGET_ARCH}/libgnustl_shared.so libs/${TARGET_ARCH}/
+git clone https://github.com/zeldin/pulseview_android_java android
+cd android
 "$ANDROID_TOOLS/android" update project -p . -t android-14 -n PulseView
 ant debug
 cd ../..