From 4f8cd084e4e4b857191526696e2b0d4d831456a4 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Fri, 9 Oct 2015 15:25:55 +0000
Subject: devel/android-tools-{adb,fastboot}: update to 6.0.0.r1 (marshmallow)

- Integrate most changes from -devel slaves (e.g. r392432, r397252)
- Get revision based on GH_TAGNAME (from JSON for releases)
- Take maintainership

Changes:	https://android.googlesource.com/platform/system/core/+log/android-5.1.1_r4..android-6.0.0_r1/adb
Changes:	https://android.googlesource.com/platform/system/core/+log/android-5.1.1_r4..android-6.0.0_r1/fastboot
Approved by:	kevlo (adb maintainer)
Differential Revision:	https://reviews.freebsd.org/D3842
---
 .../files/patch-base_logging.cpp                       | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 devel/android-tools-adb-devel/files/patch-base_logging.cpp

(limited to 'devel/android-tools-adb-devel/files/patch-base_logging.cpp')

diff --git a/devel/android-tools-adb-devel/files/patch-base_logging.cpp b/devel/android-tools-adb-devel/files/patch-base_logging.cpp
deleted file mode 100644
index 53bf6fdd0537..000000000000
--- a/devel/android-tools-adb-devel/files/patch-base_logging.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
---- base/logging.cpp.orig	2015-06-17 22:20:38 UTC
-+++ base/logging.cpp
-@@ -23,12 +23,14 @@
- #include <libgen.h>
- 
- // For getprogname(3) or program_invocation_short_name.
--#if defined(__ANDROID__) || defined(__APPLE__)
-+#if !defined(_WIN32) && !defined(__GLIBC__)
- #include <stdlib.h>
- #elif defined(__GLIBC__)
- #include <errno.h>
- #endif
- 
-+#include <cstring> // strlen
-+#include <cstdio>  // fprintf
- #include <iostream>
- #include <limits>
- #include <sstream>
-- 
cgit v1.2.3