third_party/re2/patches/re2-libcxx.patch - Issue 835633003: Enable libc++ on Android

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/re2/patches/re2-libcxx.patch

Issue 835633003: Enable libc++ on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase to friending fixes Created 5 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: third_party/re2/patches/re2-libcxx.patch

diff --git a/third_party/re2/patches/re2-libcxx.patch b/third_party/re2/patches/re2-libcxx.patch

index fc4dd1c90ab2ae6fb32d77d59f1a342abc9dfec3..3ef6eb5a353d93b6e47d796149d46f1fdaf62c46 100644

--- a/third_party/re2/patches/re2-libcxx.patch

+++ b/third_party/re2/patches/re2-libcxx.patch

@@ -12,3 +12,12 @@ index 8f54040..de1ef5b 100644

#include <tr1/unordered_set>

using std::tr1::unordered_set;

+@@ -54,7 +55,7 @@ using std::tr1::unordered_set;

+ #else

+ #include <unordered_set>

+-#if defined(WIN32) || defined(OS_ANDROID)

++#if defined(WIN32) || (defined(OS_ANDROID) && !defined(_LIBCPP_ABI_VERSION))

+ using std::tr1::unordered_set;

+ #else

+ using std::unordered_set;