testing/android-tools: upgrade to 8.1.0_p7

This upgrade includes a ruby script for generating ninja build file
instead of manually creating a Makefile. The ruby script is taken from
the Arch Linux PKGBUILD.

Patches have also been taken from Arch Linux but needed some
modifications.

1 files changed, 55 insertions, 42 deletions

diff --git a/testing/android-tools/APKBUILD b/testing/android-tools/APKBUILD
index 26dcf390bb..5eed435169 100644
--- a/testing/android-tools/APKBUILD
+++ b/testing/android-tools/APKBUILD
@@ -1,27 +1,29 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
 pkgname=android-tools
-pkgver=7.0.0_p24
+pkgver=8.1.0_p7
 _realver=${pkgver/_p/_r}
-pkgrel=2
+# See https://android.googlesource.com/platform/external/boringssl/+/$_realver/BORINGSSL_REVISION
+_boringssl=14308731e5446a73ac2258688a9688b524483cb6
+pkgrel=0
 pkgdesc="Android platform tools"
 url="http://tools.android.com/"
 arch="all"
-license="Apache BSD"
+license="Apache-2.0 MIT"
 depends=""
 depends_dev=""
-makedepends="zlib-dev libressl-dev pcre-dev linux-headers bsd-compat-headers"
-install=""
-subpackages=""
-source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-core-$_realver.tar.gz
-	http://dev.alpinelinux.org/archive/$pkgname/$pkgname-extras-$_realver.tar.gz
-	http://dev.alpinelinux.org/archive/$pkgname/$pkgname-libselinux-$_realver.tar.gz
-	http://dev.alpinelinux.org/archive/$pkgname/$pkgname-f2fs-tools-$_realver.tar.gz
-	http://dev.alpinelinux.org/archive/$pkgname/$pkgname-safe-iop-$_realver.tar.gz
-	http://dev.alpinelinux.org/archive/$pkgname/$pkgname-gtest-$_realver.tar.gz
-
-	android-tools.patch
+makedepends="zlib-dev pcre2-dev linux-headers bsd-compat-headers go perl
+	ruby gtest-dev cmake ninja clang clang-dev libressl-dev libusb-dev"
+source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-core-$_realver.tar.gz
+	https://dev.alpinelinux.org/archive/$pkgname/$pkgname-extras-$_realver.tar.gz
+	https://dev.alpinelinux.org/archive/$pkgname/$pkgname-selinux-$_realver.tar.gz
+	https://dev.alpinelinux.org/archive/$pkgname/$pkgname-f2fs-tools-$_realver.tar.gz
+	https://dev.alpinelinux.org/archive/$pkgname/$pkgname-e2fsprogs-$_realver.tar.gz
+
+	$pkgname-boringssl-$_realver.tar.gz::https://github.com/google/boringssl/archive/$_boringssl.tar.gz
+
 	musl-fixes.patch
+	generate_build.rb
 	"
 
 _giturl="https://android.googlesource.com/platform"
@@ -34,7 +36,7 @@ snapshot() {
 	mkdir -p "$srcdir" && cd "$srcdir"
 
 	local r=
-	for r in system/core system/extras external/libselinux external/f2fs-tools external/gtest external/safe-iop; do
+	for r in system/core system/extras external/selinux external/f2fs-tools external/e2fsprogs; do
 		local n="${r##*/}.git"
 		local f=$pkgname-"${r##*/}"
 
@@ -49,36 +51,47 @@ snapshot() {
 	scp "$srcdir"/$pkgname-*-$_realver.tar.gz dev.alpinelinux.org:/archive/$pkgname/
 }
 
+prepare() {
+	default_prepare
+
+	cd "$builddir"
+	ln -s boringssl-$_boringssl boringssl
+
+	PKGVER=$_realver \
+		CFLAGS="$CFLAGS -Wno-cpp" \
+		CXXFLAGS="$CXXFLAGS -Wno-#warnings" \
+		ruby ./generate_build.rb > build.ninja
+}
+
 build() {
-	make -C "$builddir" || return 1
+	mkdir -p "$builddir"/boringssl/build
+	cd "$builddir"/boringssl/build
+
+	cmake -GNinja \
+		-DBUILD_SHARED_LIBS=False \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+		-DCMAKE_C_FLAGS="$CFLAGS" \
+		..
+	ninja
+
+	cd "$builddir"
+	ninja
 }
 
 package() {
-	make DESTDIR="$pkgdir" PREFIX=/usr \
-		-C "$builddir" install || return 1
+	cd "$builddir"
+	mkdir -p "$pkgdir"/usr/bin
+	install -m755 fastboot adb mke2fs.android \
+		e2fsdroid ext2simg core/mkbootimg/mkbootimg \
+		"$pkgdir"/usr/bin
 }
 
-md5sums="08f229c6a7ee88c9757f7dd204454fb0  android-tools-core-7.0.0_r24.tar.gz
-1ed5c25518727a3ae614163fa63b813b  android-tools-extras-7.0.0_r24.tar.gz
-8d0d5abf79d0e56cc73cffd24f994224  android-tools-libselinux-7.0.0_r24.tar.gz
-d4923c0dc9508fa1d6299d633479e306  android-tools-f2fs-tools-7.0.0_r24.tar.gz
-5927ee8bddba0a8dcd4ffd3d8b56251e  android-tools-safe-iop-7.0.0_r24.tar.gz
-b41dd596e7ec64b5d278952dc5415cd9  android-tools-gtest-7.0.0_r24.tar.gz
-883cfac28233868a458aab9cfc5da9a1  android-tools.patch
-4f1a962a06ce980cc1623e0cd3417a45  musl-fixes.patch"
-sha256sums="b6eac2868570c458418c9d9317a00d5ca2552eb33faa693a8014b928c71c1718  android-tools-core-7.0.0_r24.tar.gz
-7085bba77af11b7758a4146bc7b13aa2c3ba6ca0e15ccf9173bc86fc32bf5342  android-tools-extras-7.0.0_r24.tar.gz
-cd6ec4a1ba06e76dbb2e9eeaa06d23d39e48a21186a9bcc7522694ca1b603b3d  android-tools-libselinux-7.0.0_r24.tar.gz
-53ae7ea6f7c28847ea249624681fc055b0e95b27f09a55946e22a8352aa91887  android-tools-f2fs-tools-7.0.0_r24.tar.gz
-7e961123b32bd0e6fd2d594508746bcaefb6e56990f3afc2c4891f25fcbd7a4d  android-tools-safe-iop-7.0.0_r24.tar.gz
-8d8e482c14b39df2e5f9db9d0dec6696adeaaf8380de4a7afd76ee83ac702b7a  android-tools-gtest-7.0.0_r24.tar.gz
-08686f177f6c1bd6901b43816aa83e5f1f3c512f583470b1a520b62d54c3d3e6  android-tools.patch
-e4423745d2ac88e24b42250b97345753c954218ec3fc98a1cb3f8b27016eab1f  musl-fixes.patch"
-sha512sums="f2e054fb236518ce101ba3a17e578985a8e4884c127c113a3e702386abbb5077c647565c21575e1d2103c1f0316c7ddcfd8602b7eadf6955d01054842430ff18  android-tools-core-7.0.0_r24.tar.gz
-2dd2b571f17d44b2edb354eee9d913e8a004604fc56cf21bb14b7d081891912443bf7a7a543edad834082f93263b200bc0539200a6cb0a4109f502742529d53f  android-tools-extras-7.0.0_r24.tar.gz
-3e985e01b4f1d413c4ffb7dea4fa6edc8350872df037eab1e3d109f6f19dcf94a7f77c9bc17d5f2838ebf6f773fb357cf9fb963caccb02b2613793d0e49f6a17  android-tools-libselinux-7.0.0_r24.tar.gz
-fbe08ddafa47d647884bb64202d4fceeabd88bcdba825dd9eb1257744b29a85317fe3cc34c991d9c8ba7838f9ab19d4b94fe2acaa3c6564f9d8689be0461b1b9  android-tools-f2fs-tools-7.0.0_r24.tar.gz
-baee83d6e0010f3884e9bd56c270294402be9eed2109871b9f2ebc833e35e506605c5d41dfea377e5e59b17b0dbbf4acee2759146d2465b5d2315eb212fa7299  android-tools-safe-iop-7.0.0_r24.tar.gz
-303d1b604bd8f8eff8d4d5d9518a43c2d4a96d5d4ca9c89d97120f987897261faa0fee4f22745d066b4a89cdbaeef15cca4cd08fab74340b94c22a8c4d312f4c  android-tools-gtest-7.0.0_r24.tar.gz
-211fb8d6c37522b26306b75a3d1d2ee05f7c914f32b91a55cfea7375f5f5a99dae484ab11f798caea96de91bb9e345fb67efab19b12c779539fb15b2a687569b  android-tools.patch
-75e09d7391dba7858cf50d98893c84986b5117e6b920109b0adb4a2e1215b8b85b427fb4e855402f21541cbf01a21430ed2d30296d041ba56c01d0c735334dca  musl-fixes.patch"
+sha512sums="0592d04a12ee992750a2975c7c6eaa0db6001fcabdd046dd4385878600f5549d74c5b418306d29faa20f1aeb0342323f1a274d6209941ca6a09c696c267d0d4d  android-tools-core-8.1.0_r7.tar.gz
+bd11d9b6c02f35715c8130f11f51ad74c1efbfe883a84c2c36bb6427de0d600494ffc5dfb9a6a60cca25b2410bd08c624fd319f01272e91afe983e72e8c9ea0d  android-tools-extras-8.1.0_r7.tar.gz
+85a55a2b9ea2205a9fd81f04a899851b498745e11bd915db8297924ab1ed71fefc9a9ea3b360f8ed9798124bff590fd7408128f19b0ff36f6118407ed7318602  android-tools-selinux-8.1.0_r7.tar.gz
+9ead522e8e82d380833bb46b8b154f46f722ef6edd3f268ba992b746c1e896e61d3b8d92c69ef0862b7e00d8f8f54b9cc298de99a5ac80338ef91357f403e75b  android-tools-f2fs-tools-8.1.0_r7.tar.gz
+722d30b43cbb7ff325927c1696cec02a4d0dbb4ded4b9016f35908d2e87d5f65875f9cbdbb935c3cb6c790ea722c3119240ad2f3adfb33e01a6a7ca62d69c158  android-tools-e2fsprogs-8.1.0_r7.tar.gz
+171b524b0452a48853b2c8010ff5e14d5d720e69eeaf1d3b79f675838f3afa94aee9de2f47b37303feb2d92cbf77639efe585786625b7b37b8cc2ba727c37fdc  android-tools-boringssl-8.1.0_r7.tar.gz
+785e201dd8131a6dc49b6b40b54bc698a33cc9500ad2161187d2505541fddd68a66aac951f0794c0d852383bb4ae2f5bd9c37455b8777462b3e3c9fa7bfe455e  musl-fixes.patch
+052bd5e602a600c21aaf30bd734dd6da37aaa62a0712a2a5cbb7f781bc2e59aad97516b65a6f985049307f849994a6b34a8646bd9b5eac247271ff5819b6a2e5  generate_build.rb"