From b8fbd0b0f07fd46dcbfe5c3ad3402c3647c7cf59 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich <kevin@archlinuxarm.org> Date: Sat, 19 Jan 2019 20:49:34 +0000 Subject: [PATCH] community/android-tools to 9.0.0_r30-1 --- community/android-tools/PKGBUILD | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/community/android-tools/PKGBUILD b/community/android-tools/PKGBUILD index a8bedc784..b4b92f530 100644 --- a/community/android-tools/PKGBUILD +++ b/community/android-tools/PKGBUILD @@ -8,7 +8,7 @@ buildarch=28 pkgname=android-tools -pkgver=9.0.0_r18 +pkgver=9.0.0_r30 pkgrel=1 pkgdesc='Android platform tools' arch=(x86_64) @@ -24,6 +24,7 @@ source=(git+https://android.googlesource.com/platform/system/core#tag=android-$p git+https://android.googlesource.com/platform/external/selinux#tag=android-$pkgver git+https://android.googlesource.com/platform/external/f2fs-tools#tag=android-$pkgver git+https://android.googlesource.com/platform/external/e2fsprogs#tag=android-$pkgver + git+https://android.googlesource.com/platform/external/avb#tag=android-$pkgver git+https://boringssl.googlesource.com/boringssl#commit=$_boringssl_commit generate_build.rb fix_build_core.patch @@ -37,6 +38,7 @@ sha1sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' + 'SKIP' '238507086a99134820cc9900545cbff06772dc30' '62446582a96b3a39e5d91e3e2ef8b8b38a5a735e' 'ec473160d7445f97bccabd1c32ac0ae2f77900c1' @@ -44,7 +46,7 @@ sha1sums=('SKIP' '7004dbd0c193668827174880de6f8434de8ceaee') prepare() { - PKGVER=$pkgver ./generate_build.rb > build.ninja + PKGVER=$pkgver LDFLAGS='-Wl,-z,relro,-z,now' ./generate_build.rb > build.ninja cd $srcdir/core patch -p1 < ../fix_build_core.patch @@ -55,6 +57,9 @@ prepare() { cd $srcdir/e2fsprogs patch -p1 < ../fix_build_e2fsprogs.patch + cd $srcdir/avb + sed -i 's|/usr/bin/env python$|/usr/bin/env python2|g' avbtool + sed -i 's/-fno-common/-fno-common -Wno-error=attributes/' $srcdir/boringssl/CMakeLists.txt mkdir -p $srcdir/boringssl/build && cd $srcdir/boringssl/build && cmake -GNinja ..; ninja } @@ -65,6 +70,6 @@ build() { package(){ install -m755 -d "$pkgdir"/usr/bin - install -m755 -t "$pkgdir"/usr/bin fastboot adb mke2fs.android e2fsdroid ext2simg core/mkbootimg/mkbootimg + install -m755 -t "$pkgdir"/usr/bin fastboot adb mke2fs.android e2fsdroid ext2simg core/mkbootimg/mkbootimg avb/avbtool install -Dm 644 bash_completion.fastboot "$pkgdir"/usr/share/bash-completion/completions/fastboot }