From 3270d07cb782bf771a0a17680246edb197310930 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Fri, 18 Sep 2015 15:43:51 +0000 Subject: devel/android-tools-{adb,fastboot}-devel: update to m.p.1212 platform/system/extras snapshot grew in size thanks to memory dumps: $ du -Ahc memory_replay/dumps/* 2.0K memory_replay/dumps/README 9.2M memory_replay/dumps/camera.zip 12M memory_replay/dumps/gmail.zip 8.4M memory_replay/dumps/maps.zip 3.9M memory_replay/dumps/surfaceflinger.zip 33M memory_replay/dumps/system_server.zip 1.8M memory_replay/dumps/systemui.zip 6.5M memory_replay/dumps/youtube.zip 74M total $ tar xOf memory_replay/dumps/youtube.zip | head 202: malloc 0xb4827400 1024 202: free 0xb4827400 202: malloc 0xb4837058 20 202: malloc 0xb4803068 4 202: malloc 0xb48370a0 17 202: malloc 0xb48370d0 18 202: malloc 0xb4837100 20 202: malloc 0xb4839040 48 202: malloc 0xb483a020 30 202: malloc 0xb483b080 98 youtube.txt: Write error Changes: https://android.googlesource.com/platform/system/core/+log/e4c1bb53068d...94c617ccbba4/adb Changes: https://android.googlesource.com/platform/system/core/+log/e4c1bb53068d...94c617ccbba4/fastboot (no changes) --- devel/android-tools-adb-devel/Makefile | 6 +++--- devel/android-tools-adb-devel/distinfo | 4 ++-- devel/android-tools-adb-devel/files/Makefile | 2 +- devel/android-tools-adb-devel/files/patch-adb_fdevent.cpp | 11 +++++++++++ .../android-tools-adb-devel/files/patch-adb_fdevent__test.cpp | 6 +++--- 5 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 devel/android-tools-adb-devel/files/patch-adb_fdevent.cpp (limited to 'devel/android-tools-adb-devel') diff --git a/devel/android-tools-adb-devel/Makefile b/devel/android-tools-adb-devel/Makefile index 688c8f10530f..f6e9ac0db180 100644 --- a/devel/android-tools-adb-devel/Makefile +++ b/devel/android-tools-adb-devel/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ -DISTVERSION= m-preview-1112 -DISTVERSIONSUFFIX= -ge4c1bb53068d -PORTREVISION= 1 +DISTVERSION= m-preview-1212 +DISTVERSIONSUFFIX= -g94c617ccbba4 +PORTREVISION= 0 PKGNAMESUFFIX= -devel CONFLICTS_INSTALL= ${PORTNAME}-[0-9]* diff --git a/devel/android-tools-adb-devel/distinfo b/devel/android-tools-adb-devel/distinfo index 7c0dc9f8868d..6cd41d6d933f 100644 --- a/devel/android-tools-adb-devel/distinfo +++ b/devel/android-tools-adb-devel/distinfo @@ -1,4 +1,4 @@ -SHA256 (android-platform_system_core-android-m-preview-1112-ge4c1bb53068d_GH0.tar.gz) = 15a0a0c047d5ac809de36d1498234aaca8b64d3dc36bd623ed4fa24832b5b0e9 -SIZE (android-platform_system_core-android-m-preview-1112-ge4c1bb53068d_GH0.tar.gz) = 1342456 +SHA256 (android-platform_system_core-android-m-preview-1212-g94c617ccbba4_GH0.tar.gz) = 1ecf8e1ff6eaf133767f80fcf7271a50762a21812166d57abaa4117c6d4ad69c +SIZE (android-platform_system_core-android-m-preview-1212-g94c617ccbba4_GH0.tar.gz) = 1361686 SHA256 (bash_completion.d/adb?id=2b8cfec) = 0d7989596a3e4937834d582eb0ddc88b8186505570772304fe51870d473916a7 SIZE (bash_completion.d/adb?id=2b8cfec) = 5198 diff --git a/devel/android-tools-adb-devel/files/Makefile b/devel/android-tools-adb-devel/files/Makefile index a76c118d406f..2602f8264550 100644 --- a/devel/android-tools-adb-devel/files/Makefile +++ b/devel/android-tools-adb-devel/files/Makefile @@ -26,8 +26,8 @@ TEST_SRCS+= adb_io_test.cpp 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+= transport_test.cpp -CFLAGS.shell_service_protocol_test.cpp+= -Dsighandler_t=sig_t .PATH: ${.CURDIR}/client SRCS+= main.cpp diff --git a/devel/android-tools-adb-devel/files/patch-adb_fdevent.cpp b/devel/android-tools-adb-devel/files/patch-adb_fdevent.cpp new file mode 100644 index 000000000000..9442e9aa10f4 --- /dev/null +++ b/devel/android-tools-adb-devel/files/patch-adb_fdevent.cpp @@ -0,0 +1,11 @@ +--- adb/fdevent.cpp.orig 2015-09-17 22:58:36 UTC ++++ adb/fdevent.cpp +@@ -53,7 +53,7 @@ int SHELL_EXIT_NOTIFY_FD = -1; + + struct PollNode { + fdevent* fde; +- pollfd pollfd; ++ ::pollfd pollfd; // -fpermissive + + PollNode(fdevent* fde) : fde(fde) { + memset(&pollfd, 0, sizeof(pollfd)); diff --git a/devel/android-tools-adb-devel/files/patch-adb_fdevent__test.cpp b/devel/android-tools-adb-devel/files/patch-adb_fdevent__test.cpp index 7fa09ed98233..492e538cf860 100644 --- a/devel/android-tools-adb-devel/files/patch-adb_fdevent__test.cpp +++ b/devel/android-tools-adb-devel/files/patch-adb_fdevent__test.cpp @@ -1,9 +1,9 @@ ---- adb/fdevent_test.cpp.orig 2015-09-05 00:01:27 UTC +--- adb/fdevent_test.cpp.orig 2015-09-17 22:58:36 UTC +++ adb/fdevent_test.cpp -@@ -18,6 +18,7 @@ - +@@ -19,6 +19,7 @@ #include + #include +#include // std::unique_ptr #include #include -- cgit v1.2.3