diff options
author | Elliott Hughes <enh@google.com> | 2018-06-13 07:54:00 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-06-13 07:54:00 -0700 |
commit | 604c3001d7574fcb201a6b817aeb81ec0fe46b95 (patch) | |
tree | 8120f370c0461bf7433254ae21b921c7dd939b58 | |
parent | b45bc1936e44298ce120a36d0d3814632a6543aa (diff) | |
parent | 5eabd664a4f902a54040b05a2b1cffac53a44fc9 (diff) | |
download | libchrome-604c3001d7574fcb201a6b817aeb81ec0fe46b95.tar.gz |
Remove Android-specific valgrind patch.
am: 5eabd664a4
Change-Id: I6e39e2a56030ad1c50d140ff093b1a0b77b098d1
-rw-r--r-- | base/third_party/valgrind/memcheck.h | 5 | ||||
-rw-r--r-- | base/third_party/valgrind/valgrind.h | 5 | ||||
-rw-r--r-- | libchrome_tools/patch/valgrind.patch | 33 |
3 files changed, 1 insertions, 42 deletions
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 |