From e7c25f9f246f34ea68ba6c4155b9fd7884162dc8 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Wed, 24 Aug 2016 12:41:31 +0000
Subject: devel/android-tools-{adb,fastboot}: update to 7.0.0.r1 (nougat)

Changes:	https://android.googlesource.com/platform/system/core/+log/android-6.0.1_r24..android-7.0.0_r1/adb
Changes:	https://android.googlesource.com/platform/system/core/+log/android-6.0.0_r26..android-7.0.0_r1/fastboot
---
 devel/android-tools-fastboot/files/patch-fastboot_socket.h | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 devel/android-tools-fastboot/files/patch-fastboot_socket.h

(limited to 'devel/android-tools-fastboot/files/patch-fastboot_socket.h')

diff --git a/devel/android-tools-fastboot/files/patch-fastboot_socket.h b/devel/android-tools-fastboot/files/patch-fastboot_socket.h
new file mode 100644
index 000000000000..6b0b4bf20dd5
--- /dev/null
+++ b/devel/android-tools-fastboot/files/patch-fastboot_socket.h
@@ -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 {
-- 
cgit v1.2.3