From 5eabd664a4f902a54040b05a2b1cffac53a44fc9 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Tue, 12 Jun 2018 13:53:23 -0700
Subject: Remove Android-specific valgrind patch.

Bug: http://b/77856586
Test: builds
Change-Id: I98f2926f5acc7a55a1fb6166573cb7753ea16a92
---
 base/third_party/valgrind/memcheck.h |  5 +----
 base/third_party/valgrind/valgrind.h |  5 -----
 libchrome_tools/patch/valgrind.patch | 33 ---------------------------------
 3 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 libchrome_tools/patch/valgrind.patch

diff --git a/base/third_party/valgrind/memcheck.h b/base/third_party/valgrind/memcheck.h
index aac34fcaf6..f59c21223a 100644
--- a/base/third_party/valgrind/memcheck.h
+++ b/base/third_party/valgrind/memcheck.h
@@ -1,6 +1,4 @@
-#ifdef ANDROID
-  #include "memcheck/memcheck.h"
-#else
+
 /*
    ----------------------------------------------------------------
 
@@ -279,4 +277,3 @@ typedef
 
 #endif
 
-#endif
diff --git a/base/third_party/valgrind/valgrind.h b/base/third_party/valgrind/valgrind.h
index 0668a710cd..0bae0aa130 100644
--- a/base/third_party/valgrind/valgrind.h
+++ b/base/third_party/valgrind/valgrind.h
@@ -1,6 +1,3 @@
-#ifdef ANDROID
-  #include "include/valgrind.h"
-#else
 /* -*- c -*-
    ----------------------------------------------------------------
 
@@ -4793,5 +4790,3 @@ VALGRIND_PRINTF_BACKTRACE(const char *format, ...)
 #undef PLAT_ppc64_aix5
 
 #endif   /* __VALGRIND_H */
-
-#endif
diff --git a/libchrome_tools/patch/valgrind.patch b/libchrome_tools/patch/valgrind.patch
deleted file mode 100644
index 7a7722c3a8..0000000000
--- a/libchrome_tools/patch/valgrind.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-# On Android, use system valgrind, instead of ones checked in to the Chromium
-# repository.
-
---- a/base/third_party/valgrind/memcheck.h
-+++ b/base/third_party/valgrind/memcheck.h
-@@ -1,4 +1,6 @@
--
-+#ifdef ANDROID
-+  #include "memcheck/memcheck.h"
-+#else
- /*
-    ----------------------------------------------------------------
- 
-@@ -277,3 +279,4 @@ typedef
- 
- #endif
- 
-+#endif
---- a/base/third_party/valgrind/valgrind.h
-+++ b/base/third_party/valgrind/valgrind.h
-@@ -1,3 +1,6 @@
-+#ifdef ANDROID
-+  #include "include/valgrind.h"
-+#else
- /* -*- c -*-
-    ----------------------------------------------------------------
- 
-@@ -4790,3 +4793,5 @@ VALGRIND_PRINTF_BACKTRACE(const char *fo
- #undef PLAT_ppc64_aix5
- 
- #endif   /* __VALGRIND_H */
-+
-+#endif
-- 
cgit v1.2.3