summaryrefslogtreecommitdiff
path: root/devel/android-tools-adb
diff options
context:
space:
mode:
Diffstat (limited to 'devel/android-tools-adb')
-rw-r--r--devel/android-tools-adb/Makefile8
-rw-r--r--devel/android-tools-adb/distinfo10
-rw-r--r--devel/android-tools-adb/files/Makefile18
-rw-r--r--devel/android-tools-adb/files/patch-adb_client_usb__libusb.cpp9
-rw-r--r--devel/android-tools-adb/files/patch-base_logging.cpp8
-rw-r--r--devel/android-tools-adb/files/patch-libcutils_threads.cpp (renamed from devel/android-tools-adb/files/patch-libcutils_threads.c)35
6 files changed, 43 insertions, 45 deletions
diff --git a/devel/android-tools-adb/Makefile b/devel/android-tools-adb/Makefile
index be02d491297b..cdfd19b09c6b 100644
--- a/devel/android-tools-adb/Makefile
+++ b/devel/android-tools-adb/Makefile
@@ -2,8 +2,8 @@
PORTNAME= android-tools-adb
DISTVERSIONPREFIX= android-
-DISTVERSION?= 8.1.0_r2
-PORTREVISION?= 1
+DISTVERSION?= 9.0.0_r3
+PORTREVISION?= 0
CATEGORIES= devel comms
MAINTAINER= jbeich@FreeBSD.org
@@ -32,8 +32,8 @@ PLIST_FILES= bin/adb
PORTDOCS= *
# Generated by "make update-revision" for "adb --version"
-SDK_REVISION?= 27.0.0
-GH_REVISION= ${DISTVERSIONSUFFIX:U86c2b588a369:S/-g//}
+SDK_REVISION?= 28.0.0
+GH_REVISION= ${DISTVERSIONSUFFIX:U0fac9018f238:S/-g//}
OPTIONS_DEFINE+=MDNSRESPONDER BASH DOCS TEST TEST_PYTHON
OPTIONS_DEFAULT=MDNSRESPONDER
diff --git a/devel/android-tools-adb/distinfo b/devel/android-tools-adb/distinfo
index 4eaa8b311b97..2039029136d1 100644
--- a/devel/android-tools-adb/distinfo
+++ b/devel/android-tools-adb/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1509048179
-SHA256 (aosp-mirror-platform_system_core-android-8.1.0_r2_GH0.tar.gz) = 29c58327e06c9c938f8f3c0d3e991339eb98c53026203fbafc564e85cb6538bc
-SIZE (aosp-mirror-platform_system_core-android-8.1.0_r2_GH0.tar.gz) = 5227210
+TIMESTAMP = 1529542722
+SHA256 (aosp-mirror-platform_system_core-android-9.0.0_r3_GH0.tar.gz) = b9de23465b304432aa2b585aa66c6bf4841b177f2139b75ca5adc5d917e0ecd6
+SIZE (aosp-mirror-platform_system_core-android-9.0.0_r3_GH0.tar.gz) = 27484684
SHA256 (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = ca3311ba47a5edd56c929ac9aae57c02c2c3f1636519c5f67abb00b6e3ecd75c
SIZE (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = 5967
-SHA256 (aosp-mirror-platform_development-android-8.1.0_r2_GH0.tar.gz) = bc9cdaf522147ce6a4d11e695394ce6044940172f8a19150e613adc4ae77279c
-SIZE (aosp-mirror-platform_development-android-8.1.0_r2_GH0.tar.gz) = 93884716
+SHA256 (aosp-mirror-platform_development-android-9.0.0_r3_GH0.tar.gz) = f35f681e6fad873f3e94b5c2362939741f15f276022717e352bd21a74653704b
+SIZE (aosp-mirror-platform_development-android-9.0.0_r3_GH0.tar.gz) = 59064522
diff --git a/devel/android-tools-adb/files/Makefile b/devel/android-tools-adb/files/Makefile
index 2694a85fa687..19df22540957 100644
--- a/devel/android-tools-adb/files/Makefile
+++ b/devel/android-tools-adb/files/Makefile
@@ -77,13 +77,13 @@ SRCS+= android_pubkey.c
TEST_SRCS+= android_pubkey_test.cpp
.PATH: ${.CURDIR}/../libcutils
-SRCS+= socket_inaddr_any_server_unix.c
-SRCS+= socket_local_client_unix.c
-SRCS+= socket_local_server_unix.c
-SRCS+= socket_network_client_unix.c
+SRCS+= socket_inaddr_any_server_unix.cpp
+SRCS+= socket_local_client_unix.cpp
+SRCS+= socket_local_server_unix.cpp
+SRCS+= socket_network_client_unix.cpp
SRCS+= ../libcutils/sockets.cpp
-SRCS+= load_file.c
-SRCS+= threads.c
+SRCS+= load_file.cpp
+SRCS+= threads.cpp
# XXX Obsolete after 10.2 or r279980/r280329
CPPFLAGS.sockets.cpp+= -o ${.TARGET}
@@ -102,11 +102,7 @@ SRCS+= stderr_write.c
CPPFLAGS+= -DADB_VERSION="\"${VERSION}\""
CPPFLAGS+= -DADB_HOST=1
-CPPFLAGS+= -DHAVE_FORKEXEC=1
-CPPFLAGS+= -DHAVE_SYMLINKS
-CPPFLAGS+= -DHAVE_TERMIO_H
-CPPFLAGS+= -DHAVE_SYS_SOCKET_H
-CPPFLAGS+= -D_FILE_OFFSET_BITS=64
+CPPFLAGS+= -Doff64_t=off_t
CPPFLAGS+= -DFAKE_LOG_DEVICE=1
CPPFLAGS+= -I${.CURDIR}
CPPFLAGS+= -I${.CURDIR}/../include
diff --git a/devel/android-tools-adb/files/patch-adb_client_usb__libusb.cpp b/devel/android-tools-adb/files/patch-adb_client_usb__libusb.cpp
index dba0da73601d..3f80a09439e8 100644
--- a/devel/android-tools-adb/files/patch-adb_client_usb__libusb.cpp
+++ b/devel/android-tools-adb/files/patch-adb_client_usb__libusb.cpp
@@ -1,13 +1,6 @@
--- adb/client/usb_libusb.cpp.orig 2017-06-20 10:50:27 UTC
+++ adb/client/usb_libusb.cpp
-@@ -22,13 +22,14 @@
-
- #include <atomic>
- #include <chrono>
-+#include <condition_variable>
- #include <memory>
- #include <mutex>
- #include <string>
+@@ -30,7 +30,7 @@
#include <thread>
#include <unordered_map>
diff --git a/devel/android-tools-adb/files/patch-base_logging.cpp b/devel/android-tools-adb/files/patch-base_logging.cpp
index 10b83f259680..634f03f3ad0b 100644
--- a/devel/android-tools-adb/files/patch-base_logging.cpp
+++ b/devel/android-tools-adb/files/patch-base_logging.cpp
@@ -28,7 +28,7 @@
+#include <pthread_np.h>
+#elif defined(__NetBSD__)
+#include <lwp.h>
-+#else
++#else // OpenBSD, Solaris
+#include <stdint.h>
#endif
@@ -39,11 +39,11 @@
return GetCurrentThreadId();
+#elif defined(__DragonFly__)
+ return lwp_gettid();
-+#elif defined(__NetBSD__)
-+ return _lwp_self();
+#elif defined(__FreeBSD__)
+ return pthread_getthreadid_np();
-+#else
++#elif defined(__NetBSD__)
++ return _lwp_self();
++#else // OpenBSD, Solaris
+ return (intptr_t) pthread_self();
#endif
}
diff --git a/devel/android-tools-adb/files/patch-libcutils_threads.c b/devel/android-tools-adb/files/patch-libcutils_threads.cpp
index f8f92e5267a7..edba016ab32d 100644
--- a/devel/android-tools-adb/files/patch-libcutils_threads.c
+++ b/devel/android-tools-adb/files/patch-libcutils_threads.cpp
@@ -1,31 +1,40 @@
---- libcutils/threads.c.orig 2015-06-17 22:20:38 UTC
-+++ libcutils/threads.c
-@@ -29,6 +29,14 @@
+--- libcutils/threads.cpp.orig 2018-07-13 19:58:45 UTC
++++ libcutils/threads.cpp
+@@ -24,11 +24,19 @@
+ #include <sys/syscall.h>
+ #include <sys/time.h>
#include <unistd.h>
- #elif defined(_WIN32)
- #include <windows.h>
+#elif defined(__DragonFly__)
+#include <unistd.h>
+#elif defined(__FreeBSD__)
+#include <pthread_np.h>
+#elif defined(__NetBSD__)
+#include <lwp.h>
-+#else
+ #elif defined(__linux__) && !defined(__ANDROID__)
+ #include <syscall.h>
+ #include <unistd.h>
+ #elif defined(_WIN32)
+ #include <windows.h>
++#else // OpenBSD, Solaris
+#include <stdint.h>
#endif
// No definition needed for Android because we'll just pick up bionic's copy.
-@@ -40,6 +48,14 @@ pid_t gettid() {
- return syscall(__NR_gettid);
- #elif defined(_WIN32)
- return GetCurrentThreadId();
+@@ -38,10 +46,18 @@ pid_t gettid() {
+ uint64_t tid;
+ pthread_threadid_np(NULL, &tid);
+ return tid;
+#elif defined(__DragonFly__)
+ return lwp_gettid();
-+#elif defined(__NetBSD__)
-+ return _lwp_self();
+#elif defined(__FreeBSD__)
+ return pthread_getthreadid_np();
-+#else
++#elif defined(__NetBSD__)
++ return _lwp_self();
+ #elif defined(__linux__)
+ return syscall(__NR_gettid);
+ #elif defined(_WIN32)
+ return GetCurrentThreadId();
++#else // OpenBSD, Solaris
+ return (intptr_t) pthread_self();
#endif
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-07 17:31:18 +0000