android-tools: update to 29.0.4.

This commit is contained in:
John 2019-10-08 19:54:24 +03:00 committed by John Zimmermann
parent 62f6567561
commit eb6a307908
2 changed files with 2 additions and 27 deletions

View file

@ -1,23 +0,0 @@
--- vendor/core/libcutils/include/cutils/threads.h 2019-08-21 20:14:13.000000000 +0300
+++ - 2019-10-01 12:14:10.187934016 +0300
@@ -33,7 +33,9 @@
// Deprecated: use android::base::GetThreadId instead, which doesn't truncate on Mac/Windows.
//
+#ifndef __GLIBC__
extern pid_t gettid();
+#endif
//
// Deprecated: use `_Thread_local` in C or `thread_local` in C++.
--- vendor/core/libcutils/threads.cpp 2018-10-25 18:22:12.000000000 +0300
+++ - 2019-10-01 12:14:27.548527357 +0300
@@ -32,7 +32,7 @@
#endif
// No definition needed for Android because we'll just pick up bionic's copy.
-#ifndef __ANDROID__
+#ifndef __GLIBC__
pid_t gettid() {
#if defined(__APPLE__)
uint64_t tid;

View file

@ -1,11 +1,9 @@
# Template file for 'android-tools'
pkgname=android-tools
version=29.0.3
version=29.0.4
revision=1
archs="armv* aarch64* x86_64* i686*"
build_style=cmake
configure_args="-DCMAKE_CXX_FLAGS=-D_FILE_OFFSET_BITS=64
-DCMAKE_C_FLAGS=-D_FILE_OFFSET_BITS=64"
hostmakedepends="perl go"
makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel"
short_desc="Android platform tools (adb and fastboot)"
@ -13,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="http://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
checksum=4cf79878356428b290eb5e659e7daebe036cbb99cf8c2dacb92586b2a5f856fc
checksum=5428e16a2baba79665cac0b11be81aa0cfa6920dc20da039711cc3d3b96a333b
case "$XBPS_TARGET_MACHINE" in
armv[56]*) makedepends+=" libatomic-devel"