svn commit: r477244 - in head/devel: android-tools-adb android-tools-adb/files android-tools-fastboot android-tools-fastboot/files
Jan Beich
jbeich at FreeBSD.org
Wed Aug 15 17:32:31 UTC 2018
Author: jbeich
Date: Wed Aug 15 17:32:28 2018
New Revision: 477244
URL: https://svnweb.freebsd.org/changeset/ports/477244
Log:
devel/android-tools-{adb,fastboot}: update to 9.0.0.r3
Changes: https://android.googlesource.com/platform/system/core/+log/android-8.1.0_r2..android-9.0.0_r3/adb
Changes: https://android.googlesource.com/platform/system/core/+log/android-8.1.0_r2..android-9.0.0_r3/fastboot
MFH: 2018Q3 (mostly bug fixes)
Added:
head/devel/android-tools-adb/files/patch-libcutils_threads.cpp (contents, props changed)
- copied, changed from r477240, head/devel/android-tools-adb/files/patch-libcutils_threads.c
head/devel/android-tools-fastboot/files/patch-libziparchive_zip__archive.cc (contents, props changed)
Deleted:
head/devel/android-tools-adb/files/patch-libcutils_threads.c
head/devel/android-tools-fastboot/files/patch-ext4__utils_ext4__utils.c
head/devel/android-tools-fastboot/files/patch-libselinux_src_init.c
Modified:
head/devel/android-tools-adb/Makefile (contents, props changed)
head/devel/android-tools-adb/distinfo (contents, props changed)
head/devel/android-tools-adb/files/Makefile (contents, props changed)
head/devel/android-tools-adb/files/patch-adb_client_usb__libusb.cpp (contents, props changed)
head/devel/android-tools-adb/files/patch-base_logging.cpp (contents, props changed)
head/devel/android-tools-fastboot/Makefile (contents, props changed)
head/devel/android-tools-fastboot/distinfo (contents, props changed)
head/devel/android-tools-fastboot/files/Makefile (contents, props changed)
head/devel/android-tools-fastboot/files/patch-base_logging.cpp (contents, props changed)
Modified: head/devel/android-tools-adb/Makefile
==============================================================================
--- head/devel/android-tools-adb/Makefile Wed Aug 15 17:30:38 2018 (r477243)
+++ head/devel/android-tools-adb/Makefile Wed Aug 15 17:32:28 2018 (r477244)
@@ -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 at 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
Modified: head/devel/android-tools-adb/distinfo
==============================================================================
--- head/devel/android-tools-adb/distinfo Wed Aug 15 17:30:38 2018 (r477243)
+++ head/devel/android-tools-adb/distinfo Wed Aug 15 17:32:28 2018 (r477244)
@@ -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
Modified: head/devel/android-tools-adb/files/Makefile
==============================================================================
--- head/devel/android-tools-adb/files/Makefile Wed Aug 15 17:30:38 2018 (r477243)
+++ head/devel/android-tools-adb/files/Makefile Wed Aug 15 17:32:28 2018 (r477244)
@@ -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
Modified: head/devel/android-tools-adb/files/patch-adb_client_usb__libusb.cpp
==============================================================================
--- head/devel/android-tools-adb/files/patch-adb_client_usb__libusb.cpp Wed Aug 15 17:30:38 2018 (r477243)
+++ head/devel/android-tools-adb/files/patch-adb_client_usb__libusb.cpp Wed Aug 15 17:32:28 2018 (r477244)
@@ -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>
Modified: head/devel/android-tools-adb/files/patch-base_logging.cpp
==============================================================================
--- head/devel/android-tools-adb/files/patch-base_logging.cpp Wed Aug 15 17:30:38 2018 (r477243)
+++ head/devel/android-tools-adb/files/patch-base_logging.cpp Wed Aug 15 17:32:28 2018 (r477244)
@@ -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
}
Copied and modified: head/devel/android-tools-adb/files/patch-libcutils_threads.cpp (from r477240, head/devel/android-tools-adb/files/patch-libcutils_threads.c)
==============================================================================
--- head/devel/android-tools-adb/files/patch-libcutils_threads.c Wed Aug 15 17:02:12 2018 (r477240, copy source)
+++ head/devel/android-tools-adb/files/patch-libcutils_threads.cpp Wed Aug 15 17:32:28 2018 (r477244)
@@ -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
}
Modified: head/devel/android-tools-fastboot/Makefile
==============================================================================
--- head/devel/android-tools-fastboot/Makefile Wed Aug 15 17:30:38 2018 (r477243)
+++ head/devel/android-tools-fastboot/Makefile Wed Aug 15 17:32:28 2018 (r477244)
@@ -2,8 +2,8 @@
PORTNAME= android-tools-fastboot
DISTVERSIONPREFIX= android-
-DISTVERSION?= 8.1.0_r2
-PORTREVISION?= 2
+DISTVERSION?= 9.0.0_r3
+PORTREVISION?= 0
CATEGORIES= devel sysutils
MASTER_SITES= https://salsa.debian.org/android-tools-team/android-tools/raw/706e754/debian/:manpage
DISTFILES= fastboot.1:manpage
@@ -12,18 +12,12 @@ EXTRACT_ONLY= ${DISTFILES:N*\:manpage:C/:.*//}
MAINTAINER= jbeich at FreeBSD.org
COMMENT= Android Fastboot protocol CLI tool
-LICENSE= APACHE20 BSD2CLAUSE PD
+LICENSE= APACHE20 BSD2CLAUSE
LICENSE_COMB= multi
-LICENSE_FILE_PD= ${WRKSRC}/libselinux/NOTICE
-LIB_DEPENDS= libpcre.so:devel/pcre
-
USE_GITHUB= yes
-GH_ACCOUNT= aosp-mirror jbeich:extras,libselinux
-GH_PROJECT= platform_system_core platform_system_extras:extras \
- platform_external_libselinux:libselinux
-GH_TAGNAME?= android-7.1.2_r17:libselinux
-GH_SUBDIR= libselinux:libselinux
+GH_ACCOUNT= aosp-mirror jbeich:extras
+GH_PROJECT= platform_system_core platform_system_extras:extras
CONFLICTS_INSTALL?= ${PORTNAME}-devel-*
@@ -35,16 +29,15 @@ MAKEFILE?= ${.CURDIR}/files/Makefile
MAKE_ENV= BINDIR="${PREFIX}/bin" EXTRADIR="${FILESDIR}" \
FILESDIR="${DOCSDIR}" \
VERSION="${SDK_REVISION}-0 ${GH_REVISION}-android" \
- MANDIR="${PREFIX}/man/man" \
- LIBPCRE="${LOCALBASE}/lib/libpcre.a"
+ MANDIR="${PREFIX}/man/man"
PLIST_FILES= bin/fastboot \
man/man1/fastboot.1.gz
PORTDOCS= *
SUB_FILES= pkg-message
# Generated by "make update-revision" for "fastboot --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= BASH DOCS
OPTIONS_SUB= yes
Modified: head/devel/android-tools-fastboot/distinfo
==============================================================================
--- head/devel/android-tools-fastboot/distinfo Wed Aug 15 17:30:38 2018 (r477243)
+++ head/devel/android-tools-fastboot/distinfo Wed Aug 15 17:32:28 2018 (r477244)
@@ -1,11 +1,9 @@
-TIMESTAMP = 1509048179
+TIMESTAMP = 1529542722
SHA256 (fastboot.1) = 2af01b064440952a82f1602691a0fecc030302722a71444946fb70d9c423d283
SIZE (fastboot.1) = 5906
-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
-SHA256 (jbeich-platform_system_extras-android-8.1.0_r2_GH0.tar.gz) = 3ffa650a11b546928ffd9cf9688aea379151cb71f90fa6ef3d7ab4bf56a9dc67
-SIZE (jbeich-platform_system_extras-android-8.1.0_r2_GH0.tar.gz) = 196070852
-SHA256 (jbeich-platform_external_libselinux-android-7.1.2_r17_GH0.tar.gz) = 659e43d3e14b4f4fe8955975ad268310bfad0529f408fb33342ed70ae0d456c7
-SIZE (jbeich-platform_external_libselinux-android-7.1.2_r17_GH0.tar.gz) = 59763
+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 (jbeich-platform_system_extras-android-9.0.0_r3_GH0.tar.gz) = d82c4576bed24bfe701bb8c781714fa70365c03aed93cf4777407215de4d672d
+SIZE (jbeich-platform_system_extras-android-9.0.0_r3_GH0.tar.gz) = 211722695
SHA256 (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = ca3311ba47a5edd56c929ac9aae57c02c2c3f1636519c5f67abb00b6e3ecd75c
SIZE (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = 5967
Modified: head/devel/android-tools-fastboot/files/Makefile
==============================================================================
--- head/devel/android-tools-fastboot/files/Makefile Wed Aug 15 17:30:38 2018 (r477243)
+++ head/devel/android-tools-fastboot/files/Makefile Wed Aug 15 17:32:28 2018 (r477244)
@@ -34,25 +34,11 @@ SRCS+= stringprintf.cpp
SRCS+= strings.cpp
# required by fastboot
-.PATH: ${.CURDIR}/../ext4_utils
-SRCS+= allocate.c
-SRCS+= contents.c
-SRCS+= crc16.c
-SRCS+= ext4_sb.c
-SRCS+= ext4_utils.c
-SRCS+= ext4fixup.c
-SRCS+= extent.c
-SRCS+= indirect.c
-SRCS+= make_ext4fs.c
-SRCS+= sha1.c
-SRCS+= wipe.c
-
-# required by fastboot
.PATH: ${.CURDIR}/../libcutils
SRCS+= android_get_control_file.cpp
SRCS+= ../libcutils/sockets.cpp
-SRCS+= socket_inaddr_any_server_unix.c
-SRCS+= socket_network_client_unix.c
+SRCS+= socket_inaddr_any_server_unix.cpp
+SRCS+= socket_network_client_unix.cpp
SRCS+= sockets_unix.cpp
CPPFLAGS.sockets.cpp+= -o ${.TARGET} # XXX pre-r279980
@@ -70,19 +56,7 @@ SRCS+= logprint.c
SRCS+= stderr_write.c
SRCS+= test_utils.cpp
-# required by ext4_utils
-.PATH: ${.CURDIR}/../libselinux/src
-SRCS+= callbacks.c
-SRCS+= check_context.c
-SRCS+= freecon.c
-SRCS+= init.c
-SRCS+= label.c
-SRCS+= label_android_property.c
-SRCS+= label_file.c
-SRCS+= label_support.c
-CPPFLAGS.label_file.c+= -D_WITH_GETLINE
-
-# required by fastboot and ext4_utils
+# required by fastboot
.PATH: ${.CURDIR}/../libsparse
SRCS+= backed_block.c
SRCS+= output_file.c
@@ -109,15 +83,11 @@ CPPFLAGS+= -DFAKE_LOG_DEVICE=1
CPPFLAGS+= -I${.CURDIR}
CPPFLAGS+= -I${.CURDIR}/../include
CPPFLAGS+= -I${.CURDIR}/../adb
-CPPFLAGS+= -I${.CURDIR}/../mkbootimg
+CPPFLAGS+= -I${.CURDIR}/../mkbootimg/include/bootimg
CPPFLAGS+= -I${.CURDIR}/../base/include
-CPPFLAGS+= -I${.CURDIR}/../ext4_utils/include
-CPPFLAGS+= -I${.CURDIR}/../f2fs_utils
-CPPFLAGS+= -I${.CURDIR}/../libselinux/include
CPPFLAGS+= -I${.CURDIR}/../libsparse/include
CPPFLAGS+= -I${.CURDIR}/../libziparchive/include
CPPFLAGS+= ${CPPFLAGS.${.IMPSRC:T}}
-CPPFLAGS+= $$(${PKG_CONFIG} libpcre --cflags 2>/dev/null)
CPPFLAGS+= $$(${PKG_CONFIG} libusb-1.0 --cflags 2>/dev/null)
CXXFLAGS+= -D__STDC_LIMIT_MACROS # DragonFly
CXXFLAGS+= -std=gnu++11
@@ -127,10 +97,9 @@ CFLAGS+= ${CPPFLAGS}
CXXFLAGS+= ${CPPFLAGS}
.endif
-LDADD+= $$(${PKG_CONFIG} libpcre --libs 2>/dev/null || echo -lpcre)
LDADD+= $$(${PKG_CONFIG} libusb-1.0 --libs 2>/dev/null || echo -lusb)
LDADD+= -lz \-lpthread
-DPADD+= ${LIBPCRE} ${LIBPTHREAD} ${LIBUSB} ${LIBZ}
+DPADD+= ${LIBPTHREAD} ${LIBUSB} ${LIBZ}
PKG_CONFIG?= pkg-config
Modified: head/devel/android-tools-fastboot/files/patch-base_logging.cpp
==============================================================================
--- head/devel/android-tools-fastboot/files/patch-base_logging.cpp Wed Aug 15 17:30:38 2018 (r477243)
+++ head/devel/android-tools-fastboot/files/patch-base_logging.cpp Wed Aug 15 17:32:28 2018 (r477244)
@@ -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
}
Added: head/devel/android-tools-fastboot/files/patch-libziparchive_zip__archive.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/android-tools-fastboot/files/patch-libziparchive_zip__archive.cc Wed Aug 15 17:32:28 2018 (r477244)
@@ -0,0 +1,29 @@
+--- libziparchive/zip_archive.cc.orig 2018-06-21 00:58:42 UTC
++++ libziparchive/zip_archive.cc
+@@ -47,6 +47,17 @@
+ #include "zip_archive_common.h"
+ #include "zip_archive_private.h"
+
++#if !defined(_WIN32)
++#if __cplusplus >= 201703 || (defined(_LIBCPP_VERSION) && __has_include(<string_view>))
++#include <string_view>
++#elif __cplusplus >= 201402
++#include <experimental/string_view>
++namespace std {
++using std::experimental::string_view;
++}
++#endif // __cplusplus >= 201703
++#endif // !defined(_WIN32)
++
+ using android::base::get_unaligned;
+
+ // Used to turn on crc checks - verify that the content CRC matches the values
+@@ -100,7 +111,7 @@ static uint32_t RoundUpPower2(uint32_t val) {
+ }
+
+ static uint32_t ComputeHash(const ZipString& name) {
+-#if !defined(_WIN32)
++#if __cplusplus >= 201402 && !defined(_WIN32)
+ return std::hash<std::string_view>{}(
+ std::string_view(reinterpret_cast<const char*>(name.name), name.name_length));
+ #else
More information about the svn-ports-head
mailing list