[arch-commits] Commit in android-tools/trunk (PKGBUILD)

[Anatol Pomozov]

    Date: Thursday, July 18, 2019 @ 23:48:36
  Author: anatolik
Revision: 491955

FS#63200: use Android SDK version for the tools

Modified:
  android-tools/trunk/PKGBUILD

----------+
 PKGBUILD |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-07-18 21:42:20 UTC (rev 491954)
+++ PKGBUILD	2019-07-18 23:48:36 UTC (rev 491955)
@@ -3,7 +3,7 @@
 # Contributor: Alucryd <alucryd at gmail dot com>
 
 pkgname=android-tools
-pkgver=9.0.0_r41
+pkgver=9.0.0_r45
 pkgrel=1
 pkgdesc='Android platform tools'
 arch=(x86_64)
@@ -43,7 +43,9 @@
           '7004dbd0c193668827174880de6f8434de8ceaee')
 
 prepare() {
-  PKGVER=$pkgver LDFLAGS='-Wl,-z,relro,-z,now' ./generate_build.rb > build.ninja
+  # for the Android version calculation see FS#63200
+  android_sdk_ver=`curl https://android.googlesource.com/platform/development/+/refs/tags/android-$pkgver/sdk/plat_tools_source.prop_template?format=TEXT | base64 -d | sed -n 's/^Pkg.Revision=\(.*\)$/\1/p'`
+  PKGVER="$android_sdk_ver-$pkgver" LDFLAGS='-Wl,-z,relro,-z,now' ./generate_build.rb > build.ninja
 
   cd $srcdir/core
   patch -p1 < ../fix_build_core.patch