From 0601a56a839ada1cc925bc150ceda34756e02f3d Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Wed, 24 Jul 2019 18:49:32 +0000 Subject: [PATCH] community/android-tools to 9.0.0_r45-1 --- community/android-tools/PKGBUILD | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/community/android-tools/PKGBUILD b/community/android-tools/PKGBUILD index 3863349a6..e9ee5c636 100644 --- a/community/android-tools/PKGBUILD +++ b/community/android-tools/PKGBUILD @@ -8,7 +8,7 @@ buildarch=28 pkgname=android-tools -pkgver=9.0.0_r41 +pkgver=9.0.0_r45 pkgrel=1 pkgdesc='Android platform tools' arch=(x86_64) @@ -19,8 +19,7 @@ optdepends=('python: for mkbootimg script') makedepends=(git clang gtest ruby cmake ninja go-pie) provides=(fastboot adb) conflicts=(fastboot adb) -# keep the boringssl commit in sync with android tree https://android.googlesource.com/platform/external/boringssl/+/$pkgver/BORINGSSL_REVISION -_boringssl_commit=45210dd4e21ace9d28cb76b3f83303fcdd2efcce +_boringssl_commit=`curl https://android.googlesource.com/platform/external/boringssl/+/refs/tags/android-$pkgver/BORINGSSL_REVISION?format=TEXT | base64 -d` source=(git+https://android.googlesource.com/platform/system/core#tag=android-$pkgver git+https://android.googlesource.com/platform/system/extras#tag=android-$pkgver git+https://android.googlesource.com/platform/external/selinux#tag=android-$pkgver @@ -48,7 +47,9 @@ sha1sums=('SKIP' '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