From: Uwe Hermann <redacted>
Date: Sun, 29 Jan 2017 18:03:41 +0000 (+0100)
Subject: sigrok-cross-android: Set "android:versionName" to a timestamp.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=a72fa42654f8bddae1b1f982e8cb4fc9f4e40435;p=sigrok-util.git

sigrok-cross-android: Set "android:versionName" to a timestamp.

Use the current date-/timestamp when building as the versionName
Android field.

This "version" basically means "git HEAD of everything as of the
build time of the APK", which includes every piece of software that
the sigrok-cross-android script grabs and builds, as well as the
pre-installed Android NDK + SDK components.
---

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 9dda710..8dd674a 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -496,6 +496,7 @@ find $PREFIX -iname "*.so" -exec ${TOOLCHAIN_TRIPLET}-strip -S {} \;
 $GIT_CLONE git://sigrok.org/pulseview
 cd pulseview
 patch -p1 < ../../pv_cmake_pkgconfig_fix.patch
+sed -i -e "s,\t\tandroid:versionName=.*$,\t\tandroid:versionName=\"`date -Iseconds`\"," android/AndroidManifest.xml
 cmake $CM -DENABLE_TESTS=y .
 make $PARALLEL $V
 ${TOOLCHAIN_TRIPLET}-strip -S libs/$TARGET_ARCH/libpulseview.so