svn commit: r409356 - in head/devel: android-tools-adb-devel android-tools-adb-devel/files android-tools-fastboot-devel android-tools-fastboot-devel/files
Jan Beich
jbeich at FreeBSD.org
Mon Feb 22 16:25:43 UTC 2016
Author: jbeich
Date: Mon Feb 22 16:25:40 2016
New Revision: 409356
URL: https://svnweb.freebsd.org/changeset/ports/409356
Log:
devel/android-tools-{adb,fastboot}-devel: update to m.p.6425
Changes: https://android.googlesource.com/platform/system/core/+log/aef26bb1a4ad..aef26bb1a4ad/adb
Changes: https://android.googlesource.com/platform/system/core/+log/aef26bb1a4ad..aef26bb1a4ad/fastboot
Added:
head/devel/android-tools-adb-devel/files/patch-base_parsenetaddress.cpp (contents, props changed)
head/devel/android-tools-fastboot-devel/files/patch-adb_sysdeps.h (contents, props changed)
- copied, changed from r409355, head/devel/android-tools-adb-devel/files/patch-adb_sysdeps.h
head/devel/android-tools-fastboot-devel/files/patch-base_errors__unix.cpp (contents, props changed)
head/devel/android-tools-fastboot-devel/files/patch-base_parsenetaddress.cpp (contents, props changed)
head/devel/android-tools-fastboot-devel/files/patch-fastboot_socket.h (contents, props changed)
Deleted:
head/devel/android-tools-adb-devel/files/patch-adb_adb__utils__test.cpp
Modified:
head/devel/android-tools-adb-devel/Makefile (contents, props changed)
head/devel/android-tools-adb-devel/distinfo (contents, props changed)
head/devel/android-tools-adb-devel/files/Makefile (contents, props changed)
head/devel/android-tools-adb-devel/files/patch-adb_sysdeps.h (contents, props changed)
head/devel/android-tools-adb-devel/files/usb_libusb.cpp (contents, props changed)
head/devel/android-tools-fastboot-devel/Makefile (contents, props changed)
head/devel/android-tools-fastboot-devel/distinfo (contents, props changed)
head/devel/android-tools-fastboot-devel/files/Makefile (contents, props changed)
Modified: head/devel/android-tools-adb-devel/Makefile
==============================================================================
--- head/devel/android-tools-adb-devel/Makefile Mon Feb 22 15:38:25 2016 (r409355)
+++ head/devel/android-tools-adb-devel/Makefile Mon Feb 22 16:25:40 2016 (r409356)
@@ -1,8 +1,8 @@
# $FreeBSD$
# Hint: git describe --abbrev=12 --match android-m-preview
-DISTVERSION= m-preview-6225
-DISTVERSIONSUFFIX= -gaef26bb1a4ad
+DISTVERSION= m-preview-6425
+DISTVERSIONSUFFIX= -g0fc006685c20
PORTREVISION= 0
PKGNAMESUFFIX= -devel
Modified: head/devel/android-tools-adb-devel/distinfo
==============================================================================
--- head/devel/android-tools-adb-devel/distinfo Mon Feb 22 15:38:25 2016 (r409355)
+++ head/devel/android-tools-adb-devel/distinfo Mon Feb 22 16:25:40 2016 (r409356)
@@ -1,5 +1,5 @@
-SHA256 (android-platform_system_core-android-m-preview-6225-gaef26bb1a4ad_GH0.tar.gz) = be20282d07edffa0301a2ffa524169ec2f27ac99597ec88920343e820d38d824
-SIZE (android-platform_system_core-android-m-preview-6225-gaef26bb1a4ad_GH0.tar.gz) = 1470573
+SHA256 (android-platform_system_core-android-m-preview-6425-g0fc006685c20_GH0.tar.gz) = 96659d021fcabbddbf86ea2e834928352fd81a91d49cabea5d03f4c51c85889e
+SIZE (android-platform_system_core-android-m-preview-6425-g0fc006685c20_GH0.tar.gz) = 1516347
SHA256 (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = dc774f101acd9514baf3e7a0ac610068116f2c093b94987ba59203a39a6439dc
SIZE (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = 5948
SHA256 (android-platform_development-android-m-preview-2510-g72f24a0_GH0.tar.gz) = a7e3172a61be2b7545fb4c10d5516cceb68b574cf7c83b7fc00c5cac0527b182
Modified: head/devel/android-tools-adb-devel/files/Makefile
==============================================================================
--- head/devel/android-tools-adb-devel/files/Makefile Mon Feb 22 15:38:25 2016 (r409355)
+++ head/devel/android-tools-adb-devel/files/Makefile Mon Feb 22 16:25:40 2016 (r409356)
@@ -23,7 +23,6 @@ SRCS+= file_sync_client.cpp
SRCS+= line_printer.cpp
SRCS+= services.cpp
SRCS+= shell_service_protocol.cpp
-# XXX SuffFindDeps may fail to restore suffix lost in transformation
SRCS+= ../adb/sockets.cpp
SRCS+= transport.cpp
SRCS+= transport_local.cpp
@@ -34,6 +33,7 @@ TEST_SRCS+= adb_utils_test.cpp
TEST_SRCS+= fdevent_test.cpp
TEST_SRCS+= shell_service_protocol_test.cpp
TEST_SRCS+= socket_test.cpp
+TEST_SRCS+= sysdeps_test.cpp
TEST_SRCS+= transport_test.cpp
.PATH: ${.CURDIR}/client
Modified: head/devel/android-tools-adb-devel/files/patch-adb_sysdeps.h
==============================================================================
--- head/devel/android-tools-adb-devel/files/patch-adb_sysdeps.h Mon Feb 22 15:38:25 2016 (r409355)
+++ head/devel/android-tools-adb-devel/files/patch-adb_sysdeps.h Mon Feb 22 16:25:40 2016 (r409356)
@@ -1,5 +1,21 @@
--- adb/sysdeps.h.orig 2015-09-05 00:01:27 UTC
+++ adb/sysdeps.h
+@@ -61,11 +61,13 @@
+ #endif
+ #endif
+
+-#ifdef _WIN32
+-
++#if !defined(__clang__) || __clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ < 7)
+ // Clang-only nullability specifiers
+ #define _Nonnull
+ #define _Nullable
++#endif
++
++#ifdef _WIN32
+
+ #include <ctype.h>
+ #include <direct.h>
@@ -401,6 +401,11 @@ typedef std::unique_ptr<HANDLE, handle_d
#include <string>
Added: head/devel/android-tools-adb-devel/files/patch-base_parsenetaddress.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/android-tools-adb-devel/files/patch-base_parsenetaddress.cpp Mon Feb 22 16:25:40 2016 (r409356)
@@ -0,0 +1,10 @@
+--- base/parsenetaddress.cpp.orig 2016-02-20 02:39:51 UTC
++++ base/parsenetaddress.cpp
+@@ -16,6 +16,7 @@
+
+ #include "android-base/parsenetaddress.h"
+
++#include <stdio.h> // sscanf
+ #include <algorithm>
+
+ #include "android-base/stringprintf.h"
Modified: head/devel/android-tools-adb-devel/files/usb_libusb.cpp
==============================================================================
--- head/devel/android-tools-adb-devel/files/usb_libusb.cpp Mon Feb 22 15:38:25 2016 (r409355)
+++ head/devel/android-tools-adb-devel/files/usb_libusb.cpp Mon Feb 22 16:25:40 2016 (r409356)
@@ -600,8 +600,8 @@ scan_usb_devices()
libusb_free_device_list(devs, 1);
}
-static void *
-device_poll_thread(void* unused)
+static void
+device_poll_thread(void*)
{
adb_thread_setname("USB scan");
D("device_poll_thread(): Created USB scan thread");
@@ -611,9 +611,6 @@ device_poll_thread(void* unused)
kick_disconnected();
scan_usb_devices();
}
-
- /* never reaching this point */
- return (NULL);
}
static void
Modified: head/devel/android-tools-fastboot-devel/Makefile
==============================================================================
--- head/devel/android-tools-fastboot-devel/Makefile Mon Feb 22 15:38:25 2016 (r409355)
+++ head/devel/android-tools-fastboot-devel/Makefile Mon Feb 22 16:25:40 2016 (r409356)
@@ -1,18 +1,19 @@
# $FreeBSD$
# Hint: git describe --abbrev=12 --match android-m-preview
-DISTVERSION= m-preview-6225
-DISTVERSIONSUFFIX= -gaef26bb1a4ad
+DISTVERSION= m-preview-6425
+DISTVERSIONSUFFIX= -g0fc006685c20
PORTREVISION= 0
PKGNAMESUFFIX= -devel
-GH_TAGNAME= ${DISTVERSIONFULL:C/-[0-9].*//}-1153-gb764f45:extras \
- ${DISTVERSIONFULL:C/-[0-9].*//}-96-g589c5ac:libselinux
+GH_TAGNAME= ${DISTVERSIONFULL:C/-[0-9].*//}-1197-g21ac023:extras \
+ ${DISTVERSIONFULL:C/-[0-9].*//}-98-gde7b594:libselinux
CONFLICTS_INSTALL= ${PORTNAME}-[0-9]*
MASTERDIR= ${.CURDIR}/../android-tools-fastboot
-FILESDIR= ${.CURDIR}/files
DISTINFO_FILE= ${.CURDIR}/distinfo
+FILESDIR= ${.CURDIR}/files
+EXTRA_PATCHES= ${.CURDIR}/files/patch-*
.include "${MASTERDIR}/Makefile"
Modified: head/devel/android-tools-fastboot-devel/distinfo
==============================================================================
--- head/devel/android-tools-fastboot-devel/distinfo Mon Feb 22 15:38:25 2016 (r409355)
+++ head/devel/android-tools-fastboot-devel/distinfo Mon Feb 22 16:25:40 2016 (r409356)
@@ -1,10 +1,10 @@
SHA256 (fastboot.1?id=706e754) = 2af01b064440952a82f1602691a0fecc030302722a71444946fb70d9c423d283
SIZE (fastboot.1?id=706e754) = 5906
-SHA256 (android-platform_system_core-android-m-preview-6225-gaef26bb1a4ad_GH0.tar.gz) = be20282d07edffa0301a2ffa524169ec2f27ac99597ec88920343e820d38d824
-SIZE (android-platform_system_core-android-m-preview-6225-gaef26bb1a4ad_GH0.tar.gz) = 1470573
-SHA256 (jbeich-platform_system_extras-android-m-preview-1153-gb764f45_GH0.tar.gz) = c890a16360c65b126d73736382085e858c7135e7fec918a18aea1c0d29a9deac
-SIZE (jbeich-platform_system_extras-android-m-preview-1153-gb764f45_GH0.tar.gz) = 76537274
-SHA256 (jbeich-platform_external_libselinux-android-m-preview-96-g589c5ac_GH0.tar.gz) = 6c8bd5123ff5e2f1110ee70cda5d3f396c128c3f92bff71035676fc12c48f81b
-SIZE (jbeich-platform_external_libselinux-android-m-preview-96-g589c5ac_GH0.tar.gz) = 59097
+SHA256 (android-platform_system_core-android-m-preview-6425-g0fc006685c20_GH0.tar.gz) = 96659d021fcabbddbf86ea2e834928352fd81a91d49cabea5d03f4c51c85889e
+SIZE (android-platform_system_core-android-m-preview-6425-g0fc006685c20_GH0.tar.gz) = 1516347
+SHA256 (jbeich-platform_system_extras-android-m-preview-1197-g21ac023_GH0.tar.gz) = bf6df99267b76e7a3446f3d4d613bbb1493b3ba43ab87aca99f0ade9d2990163
+SIZE (jbeich-platform_system_extras-android-m-preview-1197-g21ac023_GH0.tar.gz) = 76589937
+SHA256 (jbeich-platform_external_libselinux-android-m-preview-98-gde7b594_GH0.tar.gz) = 6ce79ee148103a59ed16e49fd3b9af80e84e65ec4a4ab0a883c14befd6cc29b6
+SIZE (jbeich-platform_external_libselinux-android-m-preview-98-gde7b594_GH0.tar.gz) = 59433
SHA256 (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = dc774f101acd9514baf3e7a0ac610068116f2c093b94987ba59203a39a6439dc
SIZE (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = 5948
Modified: head/devel/android-tools-fastboot-devel/files/Makefile
==============================================================================
--- head/devel/android-tools-fastboot-devel/files/Makefile Mon Feb 22 15:38:25 2016 (r409355)
+++ head/devel/android-tools-fastboot-devel/files/Makefile Mon Feb 22 16:25:40 2016 (r409356)
@@ -11,6 +11,9 @@ SRCS+= engine.cpp
SRCS+= fastboot.cpp
SRCS+= fs.cpp
SRCS+= protocol.cpp
+SRCS+= socket.cpp
+SRCS+= tcp.cpp
+SRCS+= udp.cpp
SRCS+= util.cpp
.PATH: ${EXTRADIR}
@@ -23,9 +26,11 @@ SRCS+= diagnose_usb.cpp
# required by fastboot, diagnose_usb and libziparchive
.PATH: ${.CURDIR}/../base
+SRCS+= errors_unix.cpp
SRCS+= file.cpp
-SRCS+= strings.cpp
+SRCS+= parsenetaddress.cpp
SRCS+= stringprintf.cpp
+SRCS+= strings.cpp
# required by fastboot
.PATH: ${.CURDIR}/../ext4_utils
@@ -41,6 +46,14 @@ SRCS+= make_ext4fs.c
SRCS+= sha1.c
SRCS+= wipe.c
+# required by fastboot
+.PATH: ${.CURDIR}/../libcutils
+SRCS+= ../libcutils/sockets.cpp
+SRCS+= socket_inaddr_any_server_unix.c
+SRCS+= socket_network_client_unix.c
+SRCS+= sockets_unix.cpp
+CPPFLAGS.sockets.cpp+= -o ${.TARGET} # XXX pre-r279980
+
# required by base and libutils
.PATH: ${.CURDIR}/../liblog
SRCS+= fake_log_device.c
Copied and modified: head/devel/android-tools-fastboot-devel/files/patch-adb_sysdeps.h (from r409355, head/devel/android-tools-adb-devel/files/patch-adb_sysdeps.h)
==============================================================================
--- head/devel/android-tools-adb-devel/files/patch-adb_sysdeps.h Mon Feb 22 15:38:25 2016 (r409355, copy source)
+++ head/devel/android-tools-fastboot-devel/files/patch-adb_sysdeps.h Mon Feb 22 16:25:40 2016 (r409356)
@@ -1,5 +1,21 @@
--- adb/sysdeps.h.orig 2015-09-05 00:01:27 UTC
+++ adb/sysdeps.h
+@@ -61,11 +61,13 @@
+ #endif
+ #endif
+
+-#ifdef _WIN32
+-
++#if !defined(__clang__) || __clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ < 7)
+ // Clang-only nullability specifiers
+ #define _Nonnull
+ #define _Nullable
++#endif
++
++#ifdef _WIN32
+
+ #include <ctype.h>
+ #include <direct.h>
@@ -401,6 +401,11 @@ typedef std::unique_ptr<HANDLE, handle_d
#include <string>
Added: head/devel/android-tools-fastboot-devel/files/patch-base_errors__unix.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/android-tools-fastboot-devel/files/patch-base_errors__unix.cpp Mon Feb 22 16:25:40 2016 (r409356)
@@ -0,0 +1,11 @@
+--- base/errors_unix.cpp.orig 2016-02-20 02:39:51 UTC
++++ base/errors_unix.cpp
+@@ -16,7 +16,7 @@
+
+ #include "android-base/errors.h"
+
+-#include <errno.h>
++#include <string.h>
+
+ namespace android {
+ namespace base {
Added: head/devel/android-tools-fastboot-devel/files/patch-base_parsenetaddress.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/android-tools-fastboot-devel/files/patch-base_parsenetaddress.cpp Mon Feb 22 16:25:40 2016 (r409356)
@@ -0,0 +1,10 @@
+--- base/parsenetaddress.cpp.orig 2016-02-20 02:39:51 UTC
++++ base/parsenetaddress.cpp
+@@ -16,6 +16,7 @@
+
+ #include "android-base/parsenetaddress.h"
+
++#include <stdio.h> // sscanf
+ #include <algorithm>
+
+ #include "android-base/stringprintf.h"
Added: head/devel/android-tools-fastboot-devel/files/patch-fastboot_socket.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/android-tools-fastboot-devel/files/patch-fastboot_socket.h Mon Feb 22 16:25:40 2016 (r409356)
@@ -0,0 +1,14 @@
+--- fastboot/socket.h.orig 2016-02-20 02:39:51 UTC
++++ fastboot/socket.h
+@@ -41,7 +41,10 @@
+
+ #include <android-base/macros.h>
+ #include <cutils/sockets.h>
+-#include <gtest/gtest_prod.h>
++
++// Copied from <gtest/gtest_prod.h>
++#define FRIEND_TEST(test_case_name, test_name)\
++friend class test_case_name##_##test_name##_Test
+
+ // Socket interface to be implemented for each platform.
+ class Socket {
More information about the svn-ports-all
mailing list