Looked at this a bit, but giving up for now.

Certainly not as easy as turning on use_custom_libcxx = true in GN args.

What I've experimented with so far:
- Remove most of build/config/android:runtime_library in favour of build/config/posix:runtime_library
- Add -isystem $android_ndk_root/sources/android/support/include to posix:runtime_library
- Use -nostdlib rather than -nostdlib++
- Add android_support to libs in posix:runtime_library

Problems with libc++ so far:

Other tidbits:
- Android's libcxx fork is here: https://android.googlesource.com/platform/external/libcxx/
- buildtools/third_party/libc++/trunk/include/__config:
  - _LIBCPP_HAS_QUICK_EXIT define should be set only when minSdk >= 21
- buildtools/third_party/libc++/trunk/src/locale.cpp
  - ctype<char>::classic_table() missing an #if for android (copied it from ndk's version)

At this point, I decided to check to see how different upstream libc++ is from the ndks:
$ grep -rE "#if.*ANDROID" third_party/android_tools/ndk/sources/cxx-stl/llvm-libc++/libcxx/{src,include} | wc -l
21
$ grep -rE "#if.*ANDROID" buildtools/third_party/libc++/trunk/{src,include} | wc -l
2

So... not sure it's a super feasible task to use upstream libc++ unless the ndk team at least upstreams their #ifdefs.

I thought danalbert@ had told me that NDK libc++ is basically upstream libc++ by now. Dan, am I remembering this wrong? Or did this regress again?

Last time I tried a libc++ build on Android, I discovered the android libc++ had a different symbol prefix ( bug 749784 ); has this changed too?

> At this point, I decided to check to see how different upstream libc++ is from the ndks:
> $ grep -rE "#if.*ANDROID" third_party/android_tools/ndk/sources/cxx-stl/llvm-> libc++/libcxx/{src,include} | wc -l
> 21
> $ grep -rE "#if.*ANDROID" buildtools/third_party/libc++/trunk/{src,include} | > wc -l
> 2

Doesn't look like you're checking a modern NDK. Here's what I see in external/libcxx (both NDK and platform branches):

$ grep -rE "#if.*ANDROID" src/ include/
src/system_error.cpp:#if defined(__ANDROID__)
include/support/android/locale_bionic.h:#ifndef _LIBCPP_SUPPORT_ANDROID_LOCALE_BIONIC_H

Both of which exist upstream.

> I thought danalbert@ had told me that NDK libc++ is basically upstream libc++ by now. Dan, am I remembering this wrong? Or did this regress again?

We're more or less a pure upstream and update each release (usually). This has been the case since r13.

> Last time I tried a libc++ build on Android, I discovered the android libc++ had a different symbol prefix ( bug 749784 ); has this changed too?

No, this is intentional. It's to differentiate your STL from the system's, since they are not necessarily the same ABI.

Aaa, you're right. I was just looking at the copy of ndk within chromium (guess it's a bit old).

Wonder if you can help me with this riddle then:

../../third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF obj/buildtools/third_party/libc++/libc++/locale.o.d -D_LIBCPP_BUILDING_LIBRARY -DV8_DEPRECATION_WARNINGS -DNO_TCMALLOC -DSAFE_BROWSING_DB_REMOTE -DCHROMIUM_BUILD -DFIELDTRIAL_TESTING_ENABLED -DCR_CLANG_REVISION=\"313786-1\" -D_FILE_OFFSET_BITS=64 -DANDROID -DHAVE_SYS_UIO_H -DANDROID_NDK_VERSION_ROLL=r12b_1 -DCOMPONENT_BUILD -D_DEBUG -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -DLIBCXX_BUILDING_LIBCXXABI -I../.. -Igen -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -Wno-builtin-macro-redefined -D__DATE__= -D__TIME__= -D__TIMESTAMP__= -funwind-tables -fPIC -pipe -fcolor-diagnostics -ffunction-sections -fno-short-enums --target=arm-linux-androideabi -march=armv7-a -mfloat-abi=softfp -mtune=generic-armv7-a -mfpu=neon -mthumb -Oz -fno-ident -fdata-sections -ffunction-sections -fomit-frame-pointer -gdwarf-3 -g1 -fdebug-info-for-profiling -fvisibility=hidden -Xclang -load -Xclang ../../third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so -Xclang -add-plugin -Xclang find-bad-constructs -Xclang -plugin-arg-find-bad-constructs -Xclang check-auto-raw-pointer -Xclang -plugin-arg-find-bad-constructs -Xclang check-ipc -Wheader-hygiene -Wstring-conversion -Wtautological-overlap-compare -fPIC -fstrict-aliasing -Werror -Wall -Wno-unused-variable -Wno-missing-field-initializers -Wno-unused-parameter -Wno-c++11-narrowing -Wno-covered-switch-default -Wno-unneeded-internal-declaration -Wno-inconsistent-missing-override -Wno-undefined-var-template -Wno-nonportable-include-path -Wno-address-of-packed-member -Wno-unused-lambda-capture -Wno-user-defined-warnings -Wno-enum-compare-switch -Wno-tautological-unsigned-zero-compare -Wno-null-pointer-arithmetic -Wno-tautological-unsigned-enum-zero-compare -Wno-undefined-bool-conversion -Wno-tautological-undefined-compare -std=gnu++14 -nostdinc++ -isystem../../buildtools/third_party/libc++/trunk/include -isystem../../buildtools/third_party/libc++abi/trunk/include -isystem../../third_party/android_tools/ndk/sources/android/support/include --sysroot=../../third_party/android_tools/ndk/platforms/android-16/arch-arm -fvisibility-inlines-hidden -frtti -c ../../buildtools/third_party/libc++/trunk/src/locale.cpp -o obj/buildtools/third_party/libc++/libc++/locale.o
../../buildtools/third_party/libc++/trunk/src/locale.cpp:1141:3: error: ctype<char>::classic_table() is not implemented [-Werror,-W#warnings]
# warning  ctype<char>::classic_table() is not implemented
  ^
1 error generated.


I added a #warning to __config here:
#if defined(__BIONIC__) || defined(__CloudABI__) ||                            \
    defined(__Fuchsia__) || defined(_LIBCPP_HAS_MUSL_LIBC)
#warngin asdfkj
#define _LIBCPP_PROVIDES_DEFAULT_RUNE_TABLE
#endif

and it's not being hit, which means __BIONIC__ is not being set.

I see __BIONIC__ is defined in the sysroot at sys/cdefs.h, but nothing in stdc++ directly includes it (not sure the normal path for it to be included).

Any idea what's misconfigured?

https://android.googlesource.com/platform/external/libcxx/+/ndk/include/__config#169

Ah, okay, I think the issue is that we need to update our ndk version first then (we're at r12b, which doesn't do much in features.h.

 Issue 747675  has been merged into this issue.

Some work has already been done at  bug 747675 .  The ARM build is working, but ARM64 is missing some things that were added in a later NDK.  For now, we're blocked on updating the NDK, and once that's done, we should be able to land https://chromium-review.googlesource.com/c/chromium/src/+/754033

Looks like the ndk update has happened.

Unfortunately still blocked on  bug 749784 , unless we want to set enable_gvr_services=!use_custom_libcxx

pcc: Is it safe for now to enable libc++ if (is_android && enable_chrome_android_internal && !is_official_build)?  

That should be fine, but I think that would cause an ABI mismatch between the shim prebuilts and the rest of chrome if we ever update the shim prebuilts again, so we'd better also change the build instructions in clank/third_party/gvr_shim/import_sources.py to pass use_custom_libcxx=false.

Sounds like this is unblocked now?

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/buildtools/+/ae5162d61ffc7b32555675447842e2313f454673

commit ae5162d61ffc7b32555675447842e2313f454673
Author: Tom Anderson <thomasanderson@chromium.org>
Date: Wed May 09 23:32:35 2018

Remove unnecessary android_crazy_linker dependency from libc++abi

android_crazy_linker provides some other symbols that conflict with those
provided by Chrome.  This CL replaces the android_crazy_linker dependency, which
used to provide __cxa_demangle, with cxa_demangle_stub.cc that used to live in
base/android.

BUG= 767901 
R=pcc
CC=​thakis

Change-Id: I7713cf14f458879deaf1e0c02277bd2e073d3317

[add] https://crrev.com/ae5162d61ffc7b32555675447842e2313f454673/third_party/libc++abi/cxa_demangle_stub.cc
[modify] https://crrev.com/ae5162d61ffc7b32555675447842e2313f454673/third_party/libc++abi/BUILD.gn

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/buildtools/+/c2fb17cecaf9120d5c7b6bc4ba78db17fad99c90

commit c2fb17cecaf9120d5c7b6bc4ba78db17fad99c90
Author: Tom Anderson <thomasanderson@chromium.org>
Date: Fri May 11 15:18:00 2018

Correctly configure __cxa_demangle visibility

This is a followup to [1].  __cxa_demangle was not getting exported for static
builds, which was gvr_shim to fail to link.  This CL corrects the visibility so
that it's:
1. not exported for non-libc++ builds
2. not exported for static libc++ builds
3. exported for shared libc++ builds

Additionally, for static libc++ builds, android_crazy_linker also provides
__cxa_demangle.  To allow it to override the one used here, __cxa_demangle is
made a weak symbol.

[1] https://chromium.googlesource.com/chromium/buildtools/+/ae5162d61ffc7b32555675447842e2313f454673

R=thakis
CC=pcc
BUG= 767901 

Change-Id: Id4b3ad3221fb1ad4c5367925241036b11e8427a4
[modify] https://crrev.com/c2fb17cecaf9120d5c7b6bc4ba78db17fad99c90/third_party/libc++abi/cxa_demangle_stub.cc
[modify] https://crrev.com/c2fb17cecaf9120d5c7b6bc4ba78db17fad99c90/third_party/libc++abi/BUILD.gn

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/buildtools/+/a9e946f166b73f9dc170129f6586a1e68efb0ab3

commit a9e946f166b73f9dc170129f6586a1e68efb0ab3
Author: Tom Anderson <thomasanderson@chromium.org>
Date: Fri May 11 19:58:27 2018

Exclude libc++abi target when use_custom_libcxx=false

//base pulls in //buildtools/third_party/libc++abi:cxa_demangle_stub.  Doing
this causes gn to see the file buildtools/third_party/libc++abi/BUILD.gn, which
means all targets from it will get added to gn_all.

We want to avoid this in cases where use_custom_libcxx=false.  This was causing
the build to fail on Android because libc++(abi) was pulling in headers from
Android's copy of libc++.

BUG= 767901 
R=thakis

Change-Id: I3578bf4d7917c5385769956d11fadc1200cd16fd
[modify] https://crrev.com/a9e946f166b73f9dc170129f6586a1e68efb0ab3/third_party/libc++abi/BUILD.gn

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/3f817f18e8c9b9612ae7de23f1b4f9399944f1d4

commit 3f817f18e8c9b9612ae7de23f1b4f9399944f1d4
Author: Tom Anderson <thomasanderson@chromium.org>
Date: Sat May 12 01:24:01 2018

Move cxa_demangle_stub.cc from base to libc++abi

On Android, cxa_demangle_stub.cc provides __cxa_demangle.  We use this to
prevent pulling in libc++abi's large demangler.

However, regular c++ code expects __cxa_demangle to be available simply by
linking against a c++ standard library.  Therefore, we move the stub into
libc++abi so other targets don't need to explicitly specify cxa_demangle_stub.cc
as a dependency.

This CL also includes a buildtools roll which includes 4 revisions:
https://chromium.googlesource.com/chromium/buildtools/+log/0b71401b977fba99eb0c7bb01bdb3338f45bd911..a9e946f166b73f9dc170129f6586a1e68efb0ab3

BUG= 767901 
R=thakis

Change-Id: I627833b1379ba938c07b3ab6645a775220a7aeb0
Reviewed-on: https://chromium-review.googlesource.com/1054198
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#558084}
[modify] https://crrev.com/3f817f18e8c9b9612ae7de23f1b4f9399944f1d4/DEPS
[modify] https://crrev.com/3f817f18e8c9b9612ae7de23f1b4f9399944f1d4/base/BUILD.gn
[delete] https://crrev.com/99b1e5dc7e2baefede3785fec1ec4b8159cfcd82/base/android/cxa_demangle_stub.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/buildtools/+/4cbff1e40ea64764ea35d6be7dc930735b7a2a14

commit 4cbff1e40ea64764ea35d6be7dc930735b7a2a14
Author: Tom Anderson <thomasanderson@chromium.org>
Date: Wed May 16 23:00:22 2018

Roll lib{cxx,unwind} to ToT

Changelogs:
https://chromium.googlesource.com/chromium/llvm-project/libcxx/+log/ece1de8658d749e19c12cacd4458cc330eca94e3..85a7702b4cc5d69402791fe685f151cf3076be71
https://chromium.googlesource.com/external/llvm.org/libunwind/+log/0f3cbe4123f8afacd646bd4f5414aa6528ef8129..1e1c6b739595098ba5c466bfe9d58b993e646b48

libc++abi was already up-to-date.

BUG= 767901 
R=thakis

Change-Id: I26f594ca9119bbefaedd4de8a7a5867bcc782b1e
[modify] https://crrev.com/4cbff1e40ea64764ea35d6be7dc930735b7a2a14/deps_revisions.gni
[modify] https://crrev.com/4cbff1e40ea64764ea35d6be7dc930735b7a2a14/DEPS

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/8bab347781abeeafa9ea013fb57f16b33995b827

commit 8bab347781abeeafa9ea013fb57f16b33995b827
Author: Tom Anderson <thomasanderson@chromium.org>
Date: Thu May 17 02:59:20 2018

Roll buildtools

Includes 4 changes:
https://chromium.googlesource.com/chromium/buildtools/+log/a9e946f166b73f9dc170129f6586a1e68efb0ab3..94288c26d2ffe3aec9848c147839afee597acefd

Notably, libc++ and libunwind are rolled.

BUG= 767901 
R=thakis

Change-Id: Ie4ce691439dea7a362501ebaba9c2ccc130ea90a
Reviewed-on: https://chromium-review.googlesource.com/1063019
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#559407}
[modify] https://crrev.com/8bab347781abeeafa9ea013fb57f16b33995b827/DEPS

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/clank/internal/apps/+/735324c584bdce09e3009f2ed288e42e20006261

commit 735324c584bdce09e3009f2ed288e42e20006261
Author: Tom Anderson <thomasanderson@google.com>
Date: Tue May 22 16:13:08 2018

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/clank/internal/apps/+/168e48f36152668a245e7b8cea2d6db501c65f4a

commit 168e48f36152668a245e7b8cea2d6db501c65f4a
Author: Tom Anderson <thomasanderson@google.com>
Date: Tue May 22 16:14:47 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/35d4226c2a826af0b65c9a701152bc3e5f110a41

commit 35d4226c2a826af0b65c9a701152bc3e5f110a41
Author: Tom Anderson <thomasanderson@chromium.org>
Date: Wed May 23 16:29:55 2018

Remove gn dep from services/data_decoder/public/cpp:cpp

The dependency on safe_json_java($default_toolchain) is causing libmonochrome (a
32-bit library) to link in 64-bit code.  This causes lld to error out when
use_custom_libcxx=true [1].  The dependency doesn't seem necessary, so this CL
removes it altogether.

[1] https://chromium-review.googlesource.com/c/chromium/src/+/1066596

BUG= 767901 
CC=pcc

Change-Id: I37228ae0a271b50024aa4b786e7f947f33aa9235
Reviewed-on: https://chromium-review.googlesource.com/1069914
Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#561116}
[modify] https://crrev.com/35d4226c2a826af0b65c9a701152bc3e5f110a41/services/data_decoder/public/cpp/BUILD.gn

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/16eac9c07ccb9c9b7fc4f65bdbae974904cd1e79

commit 16eac9c07ccb9c9b7fc4f65bdbae974904cd1e79
Author: Tom Anderson <thomasanderson@chromium.org>
Date: Wed May 23 21:26:26 2018

Add gvr_shim prebuilts for use_custom_libcxx=true builds

BUG= 767901 
R=pcc

Change-Id: I8c85d502fb56bc163b4c7e80de00975d4fadde8e
Reviewed-on: https://chromium-review.googlesource.com/1067734
Reviewed-by: Biao She <bshe@chromium.org>
Reviewed-by: Peter Collingbourne <pcc@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#561257}
[modify] https://crrev.com/16eac9c07ccb9c9b7fc4f65bdbae974904cd1e79/DEPS
[modify] https://crrev.com/16eac9c07ccb9c9b7fc4f65bdbae974904cd1e79/third_party/.gitignore
[modify] https://crrev.com/16eac9c07ccb9c9b7fc4f65bdbae974904cd1e79/third_party/gvr-android-sdk/BUILD.gn
[add] https://crrev.com/16eac9c07ccb9c9b7fc4f65bdbae974904cd1e79/third_party/gvr-android-sdk/libgvr_shim_static_custom_libcxx_arm.a.sha1
[add] https://crrev.com/16eac9c07ccb9c9b7fc4f65bdbae974904cd1e79/third_party/gvr-android-sdk/libgvr_shim_static_custom_libcxx_arm64.a.sha1

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/dc6ff4ef543f5491073f442c1fae7928024da5eb

commit dc6ff4ef543f5491073f442c1fae7928024da5eb
Author: Tom Anderson <thomasanderson@chromium.org>
Date: Thu May 24 02:22:17 2018

Android: Enable in-tree libc++ builds

BUG= 767901 
R=thakis
CC=pcc

Change-Id: Ib394126f8e729192ee41520eefd85e22531bfd65
Reviewed-on: https://chromium-review.googlesource.com/1066596
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#561361}
[modify] https://crrev.com/dc6ff4ef543f5491073f442c1fae7928024da5eb/build/config/android/BUILD.gn
[modify] https://crrev.com/dc6ff4ef543f5491073f442c1fae7928024da5eb/build/config/c++/c++.gni

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/119cc54d861f083cfa7b5268c1a536f361665e8e

commit 119cc54d861f083cfa7b5268c1a536f361665e8e
Author: Eric Stevenson <estevenson@chromium.org>
Date: Fri May 25 19:34:43 2018

Revert "Android: Enable in-tree libc++ builds"

This reverts commit dc6ff4ef543f5491073f442c1fae7928024da5eb.

Reason for revert: Binary size regression of almost 880 KB.

Original change's description:
> Android: Enable in-tree libc++ builds
> 
> BUG= 767901 
> R=​thakis
> CC=​pcc
> 
> Change-Id: Ib394126f8e729192ee41520eefd85e22531bfd65
> Reviewed-on: https://chromium-review.googlesource.com/1066596
> Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
> Reviewed-by: Nico Weber <thakis@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#561361}

TBR=thakis@chromium.org,thomasanderson@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug:  767901 ,  846745 
Change-Id: Ie330b21911f3d4a75c114d488efa3a705ad8616a
Reviewed-on: https://chromium-review.googlesource.com/1073489
Reviewed-by: Eric Stevenson <estevenson@chromium.org>
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Eric Stevenson <estevenson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#561971}
[modify] https://crrev.com/119cc54d861f083cfa7b5268c1a536f361665e8e/build/config/android/BUILD.gn
[modify] https://crrev.com/119cc54d861f083cfa7b5268c1a536f361665e8e/build/config/c++/c++.gni

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/63d69f2a0276135e87f935c1ba2b4fcce796ad34

commit 63d69f2a0276135e87f935c1ba2b4fcce796ad34
Author: Eric Stevenson <estevenson@chromium.org>
Date: Mon Jun 04 18:51:30 2018

Revert "Android: Enable in-tree libc++ builds"

This reverts commit dc6ff4ef543f5491073f442c1fae7928024da5eb.

Reason for revert: Binary size regression of almost 880 KB.

Original change's description:
> Android: Enable in-tree libc++ builds
> 
> BUG= 767901 
> R=​thakis
> CC=​pcc
> 
> Change-Id: Ib394126f8e729192ee41520eefd85e22531bfd65
> Reviewed-on: https://chromium-review.googlesource.com/1066596
> Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
> Reviewed-by: Nico Weber <thakis@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#561361}

TBR=thakis@chromium.org,thomasanderson@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug:  767901 ,  846745 
Change-Id: Ie330b21911f3d4a75c114d488efa3a705ad8616a
Reviewed-on: https://chromium-review.googlesource.com/1073489
Reviewed-by: Eric Stevenson <estevenson@chromium.org>
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Eric Stevenson <estevenson@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#561971}(cherry picked from commit 119cc54d861f083cfa7b5268c1a536f361665e8e)
Reviewed-on: https://chromium-review.googlesource.com/1085787
Cr-Commit-Position: refs/branch-heads/3440@{#154}
Cr-Branched-From: 010ddcfda246975d194964ccf20038ebbdec6084-refs/heads/master@{#561733}
[modify] https://crrev.com/63d69f2a0276135e87f935c1ba2b4fcce796ad34/build/config/android/BUILD.gn
[modify] https://crrev.com/63d69f2a0276135e87f935c1ba2b4fcce796ad34/build/config/c++/c++.gni

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/9641b86adec1ee8d34f2f1c0b11162e6dc88bb74

commit 9641b86adec1ee8d34f2f1c0b11162e6dc88bb74
Author: Peter Collingbourne <pcc@chromium.org>
Date: Tue Jul 17 23:53:14 2018

build: Disable -fwhole-program-vtables on Android.

We aren't currently building libc++ ourselves, which means that
once we enable ThinLTO in official builds, libc++ won't be built
with LTO, which is a violation of the LTO visibility rules, which
require all classes with hidden visibility to be built with LTO
when using the CFI or whole-program devirtualization features:
https://clang.llvm.org/docs/LTOVisibility.html

This hasn't caused any problems in practice as far as I know, but
it could in theory, so it's probably best to disable it to be safe.
We should be able to re-enable it on Android once  issue 767901  is
fixed and we create another GVR shim prebuilt compiled with ThinLTO.

Bug: 469376,  767901 
Change-Id: Ic5554c48c1d4a458a834b16b9f7bd20523871282
Reviewed-on: https://chromium-review.googlesource.com/1141108
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Peter Collingbourne <pcc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#575850}
[modify] https://crrev.com/9641b86adec1ee8d34f2f1c0b11162e6dc88bb74/build/config/compiler/BUILD.gn

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/36e7058d99f6446593538e25c73796578cefd4d8

commit 36e7058d99f6446593538e25c73796578cefd4d8
Author: Tom Anderson <thomasanderson@chromium.org>
Date: Fri Dec 14 20:12:54 2018

Android: Enable in-tree libc++ builds

BUG= 767901 
R=thakis
CC=pcc

Change-Id: I70b017a99fe139d3925d7318116e435f5b6223ac
Reviewed-on: https://chromium-review.googlesource.com/c/1377329
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Peter Collingbourne <pcc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#616803}
[modify] https://crrev.com/36e7058d99f6446593538e25c73796578cefd4d8/build/config/c++/c++.gni

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/0e2335f44024cc59d7c4a8a3fd76212628f1f64c

commit 0e2335f44024cc59d7c4a8a3fd76212628f1f64c
Author: Tom Anderson <thomasanderson@chromium.org>
Date: Sat Dec 15 00:33:24 2018

Disable libc++ on android and rollback buildtools to 7d88270d

This CL

1. Reverts 9a085ba23156aba9ade0a08efd3d948f9527f01e
2. Rolls buildtools back to 7d88270de197ebe8b439ab5eb57a4a2a0bb810e0
3. Disables libc++ on Android

BUG=910864, 846855 , 767901 
TBR=thakis
CC=​​mmoroz
NOTRY=true

Change-Id: I44e3a504fa6b842099fef78371c7dfcf7921f2f5
Reviewed-on: https://chromium-review.googlesource.com/c/1379245
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#616895}
[modify] https://crrev.com/0e2335f44024cc59d7c4a8a3fd76212628f1f64c/DEPS
[modify] https://crrev.com/0e2335f44024cc59d7c4a8a3fd76212628f1f64c/build/config/android/BUILD.gn
[modify] https://crrev.com/0e2335f44024cc59d7c4a8a3fd76212628f1f64c/build/config/c++/c++.gni

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/1a874fe60ccb87401867a7334b8eb11e5e4b1552

commit 1a874fe60ccb87401867a7334b8eb11e5e4b1552
Author: Tom Anderson <thomasanderson@chromium.org>
Date: Thu Dec 20 00:37:25 2018

Roll buildtools and enable in-tree libc++ on Android

Buildtools changelog:
https://chromium.googlesource.com/chromium/buildtools/+log/7d88270de197ebe8b439ab5eb57a4a2a0bb810e0..0e1cbc4eab6861b0c84bf2ed9a3c4b7aa2063819

BUG= 767901 
R=thakis

Change-Id: I96fdafca5e228cbfe7a0909170c0235e7845bbde
Reviewed-on: https://chromium-review.googlesource.com/c/1385021
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#618035}
[modify] https://crrev.com/1a874fe60ccb87401867a7334b8eb11e5e4b1552/DEPS
[modify] https://crrev.com/1a874fe60ccb87401867a7334b8eb11e5e4b1552/build/config/c++/c++.gni

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/0139283eabe99b3d50e65b74c878519a90c1c8e5

commit 0139283eabe99b3d50e65b74c878519a90c1c8e5
Author: Hans Wennborg <hans@chromium.org>
Date: Thu Dec 20 13:22:33 2018

Revert "Roll buildtools and enable in-tree libc++ on Android"

This reverts commit 1a874fe60ccb87401867a7334b8eb11e5e4b1552.

Reason for revert:
This broke the build, see bug.

Original change's description:
> Roll buildtools and enable in-tree libc++ on Android
> 
> Buildtools changelog:
> https://chromium.googlesource.com/chromium/buildtools/+log/7d88270de197ebe8b439ab5eb57a4a2a0bb810e0..0e1cbc4eab6861b0c84bf2ed9a3c4b7aa2063819
> 
> BUG= 767901 
> R=​thakis
> 
> Change-Id: I96fdafca5e228cbfe7a0909170c0235e7845bbde
> Reviewed-on: https://chromium-review.googlesource.com/c/1385021
> Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
> Commit-Queue: Nico Weber <thakis@chromium.org>
> Reviewed-by: Nico Weber <thakis@chromium.org>
> Reviewed-by: Dirk Pranke <dpranke@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#618035}

TBR=thakis@chromium.org,dpranke@chromium.org,thomasanderson@chromium.org

Change-Id: Ia54846c3ad7ed2fd03cb3c52bd1d0c18a1461a91
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug:  767901 , 916962 
Reviewed-on: https://chromium-review.googlesource.com/c/1386434
Reviewed-by: Hans Wennborg <hans@chromium.org>
Commit-Queue: Hans Wennborg <hans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#618194}
[modify] https://crrev.com/0139283eabe99b3d50e65b74c878519a90c1c8e5/DEPS
[modify] https://crrev.com/0139283eabe99b3d50e65b74c878519a90c1c8e5/build/config/c++/c++.gni

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/10e1da1f3a8a3a03f3ff9c2a8939a497aae1af89

commit 10e1da1f3a8a3a03f3ff9c2a8939a497aae1af89
Author: Tom Anderson <thomasanderson@chromium.org>
Date: Fri Dec 21 01:46:12 2018

Reland "Roll buildtools and enable in-tree libc++ on Android"

This is a reland of 1a874fe60ccb87401867a7334b8eb11e5e4b1552
Android sanitizer bots should be green after:
https://chromium-review.googlesource.com/c/chromium/src/+/1387399

Original change's description:
> Roll buildtools and enable in-tree libc++ on Android
>
> Buildtools changelog:
> https://chromium.googlesource.com/chromium/buildtools/+log/7d88270de197ebe8b439ab5eb57a4a2a0bb810e0..0e1cbc4eab6861b0c84bf2ed9a3c4b7aa2063819
>
> BUG= 767901 
> R=thakis
>
> Change-Id: I96fdafca5e228cbfe7a0909170c0235e7845bbde
> Reviewed-on: https://chromium-review.googlesource.com/c/1385021
> Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
> Commit-Queue: Nico Weber <thakis@chromium.org>
> Reviewed-by: Nico Weber <thakis@chromium.org>
> Reviewed-by: Dirk Pranke <dpranke@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#618035}

Bug:  767901 
Change-Id: Ibcf1ee670f2696aeadb1a221022d21ddc4ca6753
Reviewed-on: https://chromium-review.googlesource.com/c/1387745
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#618427}
[modify] https://crrev.com/10e1da1f3a8a3a03f3ff9c2a8939a497aae1af89/DEPS
[modify] https://crrev.com/10e1da1f3a8a3a03f3ff9c2a8939a497aae1af89/build/config/c++/c++.gni

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/97e6cbbcb0071b5db924187dd6bb1ea4de129f96

commit 97e6cbbcb0071b5db924187dd6bb1ea4de129f96
Author: Thomas Anderson <thomasanderson@chromium.org>
Date: Fri Dec 21 20:06:07 2018

Revert "Reland "Roll buildtools and enable in-tree libc++ on Android""

This reverts commit 10e1da1f3a8a3a03f3ff9c2a8939a497aae1af89.

Reason for revert: https://crbug.com/916973

Original change's description:
> Reland "Roll buildtools and enable in-tree libc++ on Android"
> 
> This is a reland of 1a874fe60ccb87401867a7334b8eb11e5e4b1552
> Android sanitizer bots should be green after:
> https://chromium-review.googlesource.com/c/chromium/src/+/1387399
> 
> Original change's description:
> > Roll buildtools and enable in-tree libc++ on Android
> >
> > Buildtools changelog:
> > https://chromium.googlesource.com/chromium/buildtools/+log/7d88270de197ebe8b439ab5eb57a4a2a0bb810e0..0e1cbc4eab6861b0c84bf2ed9a3c4b7aa2063819
> >
> > BUG= 767901 
> > R=thakis
> >
> > Change-Id: I96fdafca5e228cbfe7a0909170c0235e7845bbde
> > Reviewed-on: https://chromium-review.googlesource.com/c/1385021
> > Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
> > Commit-Queue: Nico Weber <thakis@chromium.org>
> > Reviewed-by: Nico Weber <thakis@chromium.org>
> > Reviewed-by: Dirk Pranke <dpranke@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#618035}
> 
> Bug:  767901 
> Change-Id: Ibcf1ee670f2696aeadb1a221022d21ddc4ca6753
> Reviewed-on: https://chromium-review.googlesource.com/c/1387745
> Reviewed-by: Nico Weber <thakis@chromium.org>
> Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#618427}

TBR=thakis@chromium.org,dpranke@chromium.org,thomasanderson@chromium.org

Change-Id: Ibe9317d04e44f65d67e5876e3bbae83b57b1a026
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug:  767901 
Reviewed-on: https://chromium-review.googlesource.com/c/1388717
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#618577}
[modify] https://crrev.com/97e6cbbcb0071b5db924187dd6bb1ea4de129f96/DEPS
[modify] https://crrev.com/97e6cbbcb0071b5db924187dd6bb1ea4de129f96/build/config/c++/c++.gni

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/49e7497eca31215bbe48b93ca3d4103e59f73dfb

commit 49e7497eca31215bbe48b93ca3d4103e59f73dfb
Author: Tom Anderson <thomasanderson@chromium.org>
Date: Fri Jan 04 19:17:40 2019

Add a prebuilt libgvr_shim static library for the Cr libc++ ABI version

This is necessary since there's now 3 different ABIs for libc++: ndk1, 1, and
Cr.  The ndk1 and 1 ABIs already had prebuilts, but the Cr ABI was introduced to
fix an issue with Android component builds.  All three are necessary right now,
but the ndk1 prebuilt can be removed once use_custom_libcxx=true is set on all
Android builds.

Internal CL that updates docs:
https://chrome-internal-review.googlesource.com/c/clank/internal/apps/+/767848

BUG= 767901 
R=bajones
CC=​thakis

Change-Id: Ib8d361152a5efb169a42c370fa4e6a80025b7af5
Reviewed-on: https://chromium-review.googlesource.com/c/1395186
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#620027}
[modify] https://crrev.com/49e7497eca31215bbe48b93ca3d4103e59f73dfb/DEPS
[modify] https://crrev.com/49e7497eca31215bbe48b93ca3d4103e59f73dfb/third_party/.gitignore
[modify] https://crrev.com/49e7497eca31215bbe48b93ca3d4103e59f73dfb/third_party/gvr-android-sdk/BUILD.gn
[delete] https://crrev.com/2c3b194535c675bb42b060deae3cf79e06f2725a/third_party/gvr-android-sdk/libgvr_shim_static_arm.a.sha1
[delete] https://crrev.com/2c3b194535c675bb42b060deae3cf79e06f2725a/third_party/gvr-android-sdk/libgvr_shim_static_arm64.a.sha1
[add] https://crrev.com/49e7497eca31215bbe48b93ca3d4103e59f73dfb/third_party/gvr-android-sdk/libgvr_shim_static_arm64_1.a.sha1
[add] https://crrev.com/49e7497eca31215bbe48b93ca3d4103e59f73dfb/third_party/gvr-android-sdk/libgvr_shim_static_arm64_Cr.a.sha1
[add] https://crrev.com/49e7497eca31215bbe48b93ca3d4103e59f73dfb/third_party/gvr-android-sdk/libgvr_shim_static_arm64_ndk1.a.sha1
[add] https://crrev.com/49e7497eca31215bbe48b93ca3d4103e59f73dfb/third_party/gvr-android-sdk/libgvr_shim_static_arm_1.a.sha1
[add] https://crrev.com/49e7497eca31215bbe48b93ca3d4103e59f73dfb/third_party/gvr-android-sdk/libgvr_shim_static_arm_Cr.a.sha1
[add] https://crrev.com/49e7497eca31215bbe48b93ca3d4103e59f73dfb/third_party/gvr-android-sdk/libgvr_shim_static_arm_ndk1.a.sha1
[delete] https://crrev.com/2c3b194535c675bb42b060deae3cf79e06f2725a/third_party/gvr-android-sdk/libgvr_shim_static_custom_libcxx_arm.a.sha1
[delete] https://crrev.com/2c3b194535c675bb42b060deae3cf79e06f2725a/third_party/gvr-android-sdk/libgvr_shim_static_custom_libcxx_arm64.a.sha1

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/clank/internal/apps/+/c69aa0b45a734c637aa84b3d7989a7f85da94f09

commit c69aa0b45a734c637aa84b3d7989a7f85da94f09
Author: Tom Anderson <thomasanderson@google.com>
Date: Fri Jan 04 20:27:41 2019

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/94e405bbff1a3034783e39c867d584937d41894d

commit 94e405bbff1a3034783e39c867d584937d41894d
Author: Tom Anderson <thomasanderson@chromium.org>
Date: Fri Jan 04 22:41:03 2019

Reland "Roll buildtools and enable in-tree libc++ on Android"

This is a reland of 1a874fe60ccb87401867a7334b8eb11e5e4b1552

Original change's description:
> Roll buildtools and enable in-tree libc++ on Android
> 
> Buildtools changelog:
> https://chromium.googlesource.com/chromium/buildtools/+log/7d88270de197ebe8b439ab5eb57a4a2a0bb810e0..0e1cbc4eab6861b0c84bf2ed9a3c4b7aa2063819
> 
> BUG= 767901 
> R=thakis
> 
> Change-Id: I96fdafca5e228cbfe7a0909170c0235e7845bbde
> Reviewed-on: https://chromium-review.googlesource.com/c/1385021
> Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
> Commit-Queue: Nico Weber <thakis@chromium.org>
> Reviewed-by: Nico Weber <thakis@chromium.org>
> Reviewed-by: Dirk Pranke <dpranke@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#618035}

Bug:  767901 
Change-Id: I17d2e4fe9661cfe3470fce0fc1099f73d801bd32
Reviewed-on: https://chromium-review.googlesource.com/c/1394229
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#620092}
[modify] https://crrev.com/94e405bbff1a3034783e39c867d584937d41894d/DEPS
[modify] https://crrev.com/94e405bbff1a3034783e39c867d584937d41894d/build/config/c++/c++.gni

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/19950fdacccd126d140779c2af190bbe7d37eae8

commit 19950fdacccd126d140779c2af190bbe7d37eae8
Author: Thomas Anderson <thomasanderson@chromium.org>
Date: Sat Jan 05 18:46:51 2019

Revert "Reland "Roll buildtools and enable in-tree libc++ on Android""

This reverts commit 94e405bbff1a3034783e39c867d584937d41894d.

Reason for revert: Android Cronet Builder Asan is still broken

Original change's description:
> Reland "Roll buildtools and enable in-tree libc++ on Android"
> 
> This is a reland of 1a874fe60ccb87401867a7334b8eb11e5e4b1552
> 
> Original change's description:
> > Roll buildtools and enable in-tree libc++ on Android
> > 
> > Buildtools changelog:
> > https://chromium.googlesource.com/chromium/buildtools/+log/7d88270de197ebe8b439ab5eb57a4a2a0bb810e0..0e1cbc4eab6861b0c84bf2ed9a3c4b7aa2063819
> > 
> > BUG= 767901 
> > R=thakis
> > 
> > Change-Id: I96fdafca5e228cbfe7a0909170c0235e7845bbde
> > Reviewed-on: https://chromium-review.googlesource.com/c/1385021
> > Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
> > Commit-Queue: Nico Weber <thakis@chromium.org>
> > Reviewed-by: Nico Weber <thakis@chromium.org>
> > Reviewed-by: Dirk Pranke <dpranke@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#618035}
> 
> Bug:  767901 
> Change-Id: I17d2e4fe9661cfe3470fce0fc1099f73d801bd32
> Reviewed-on: https://chromium-review.googlesource.com/c/1394229
> Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
> Reviewed-by: Nico Weber <thakis@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#620092}

TBR=thakis@chromium.org,dpranke@chromium.org,thomasanderson@chromium.org

Change-Id: Ic5e69025cd0526a88ffd15febdc9726c471d1255
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug:  767901 
Reviewed-on: https://chromium-review.googlesource.com/c/1396692
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#620190}
[modify] https://crrev.com/19950fdacccd126d140779c2af190bbe7d37eae8/DEPS
[modify] https://crrev.com/19950fdacccd126d140779c2af190bbe7d37eae8/build/config/c++/c++.gni

thomasanderson@, not sure if Android Cronet Builder Asan failure is the same as issue 915429, but could you please make sure that unw_getcontext is defined when building with your version of libc++? I.e. I think -lc++abi used to define unw_getcontext, but since you replace it with the version from buildtools/third_party/libc++abi you also need to link with buildtools/third_party/libunwind.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/4c782bbf8fb8f33e2577467a2cc96385f5432d4c

commit 4c782bbf8fb8f33e2577467a2cc96385f5432d4c
Author: Tom Anderson <thomasanderson@chromium.org>
Date: Fri Jan 11 05:25:42 2019

Reland "Roll buildtools and enable in-tree libc++ on Android"

This is a reland of 1a874fe60ccb87401867a7334b8eb11e5e4b1552

Original change's description:
> Roll buildtools and enable in-tree libc++ on Android
>
> Buildtools changelog:
> https://chromium.googlesource.com/chromium/buildtools/+log/7d88270de197ebe8b439ab5eb57a4a2a0bb810e0..0e1cbc4eab6861b0c84bf2ed9a3c4b7aa2063819
>
> BUG= 767901 
> R=thakis
>
> Change-Id: I96fdafca5e228cbfe7a0909170c0235e7845bbde
> Reviewed-on: https://chromium-review.googlesource.com/c/1385021
> Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
> Commit-Queue: Nico Weber <thakis@chromium.org>
> Reviewed-by: Nico Weber <thakis@chromium.org>
> Reviewed-by: Dirk Pranke <dpranke@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#618035}

TBR=thakis

Bug:  767901 
Change-Id: Id8645ae0fb1c4801d3ed4a10efd3e91239058163
Reviewed-on: https://chromium-review.googlesource.com/c/1405720
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#621915}
[modify] https://crrev.com/4c782bbf8fb8f33e2577467a2cc96385f5432d4c/DEPS
[modify] https://crrev.com/4c782bbf8fb8f33e2577467a2cc96385f5432d4c/build/config/c++/c++.gni

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/e913d89d5429050fa24d770849e3307fcb18a816

commit e913d89d5429050fa24d770849e3307fcb18a816
Author: Tom Anderson <thomasanderson@chromium.org>
Date: Fri Jan 11 23:23:46 2019

Fix Cronet test APKs on Android Cronet Builder Asan

This is a fix for the failuers on Android Cronet Builder Asan [1].  This is the
equivalent change as already done in [2].

[1] https://ci.chromium.org/buildbot/chromium.android/Android%20Cronet%20Builder%20Asan/8838
[2] https://chromium-review.googlesource.com/c/angle/angle/+/1405908

BUG= 767901 
R=mef,pauljensen

Change-Id: I4a5c3c5a52d33f07f5699038bfdb29799bb2558b
Reviewed-on: https://chromium-review.googlesource.com/c/1407381
Reviewed-by: Misha Efimov <mef@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#622213}
[modify] https://crrev.com/e913d89d5429050fa24d770849e3307fcb18a816/components/cronet/android/BUILD.gn

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/buildtools/+/40194ab03962d8183b2796fa58a39ec8a9e83a41

commit 40194ab03962d8183b2796fa58a39ec8a9e83a41
Author: Tom Anderson <thomasanderson@chromium.org>
Date: Mon Jan 14 23:42:41 2019

Do TODOs related to Android/libc++

BUG= 767901 
R=thakis

Change-Id: Ie4cefe7b8169ab66ba18461397be31d64269f9ca

[modify] https://crrev.com/40194ab03962d8183b2796fa58a39ec8a9e83a41/third_party/libc++abi/cxa_demangle_stub.cc
[modify] https://crrev.com/40194ab03962d8183b2796fa58a39ec8a9e83a41/third_party/libc++abi/BUILD.gn

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/14bc9e7b847f9d1a9d7ad6b2f244734bfc17bcc3

commit 14bc9e7b847f9d1a9d7ad6b2f244734bfc17bcc3
Author: Thomas Anderson <thomasanderson@chromium.org>
Date: Tue Jan 15 00:36:13 2019

Revert "Fix Cronet test APKs on Android Cronet Builder Asan"

This reverts commit e913d89d5429050fa24d770849e3307fcb18a816.

Reason for revert: No longer necessary after https://chromium-review.googlesource.com/c/chromium/src/+/1409558

Original change's description:
> Fix Cronet test APKs on Android Cronet Builder Asan
> 
> This is a fix for the failuers on Android Cronet Builder Asan [1].  This is the
> equivalent change as already done in [2].
> 
> [1] https://ci.chromium.org/buildbot/chromium.android/Android%20Cronet%20Builder%20Asan/8838
> [2] https://chromium-review.googlesource.com/c/angle/angle/+/1405908
> 
> BUG= 767901 
> R=​mef,pauljensen
> 
> Change-Id: I4a5c3c5a52d33f07f5699038bfdb29799bb2558b
> Reviewed-on: https://chromium-review.googlesource.com/c/1407381
> Reviewed-by: Misha Efimov <mef@chromium.org>
> Reviewed-by: Nico Weber <thakis@chromium.org>
> Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#622213}

TBR=thakis@chromium.org,pauljensen@chromium.org,mef@chromium.org,thomasanderson@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug:  767901 
Change-Id: Ifbe61abd801f7b9289baeb3e50311787f4f15e69
Reviewed-on: https://chromium-review.googlesource.com/c/1410265
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#622653}
[modify] https://crrev.com/14bc9e7b847f9d1a9d7ad6b2f244734bfc17bcc3/components/cronet/android/BUILD.gn

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/e046b872aa1757eb3a9cb9a31a8b5c0e79cff729

commit e046b872aa1757eb3a9cb9a31a8b5c0e79cff729
Author: Tom Anderson <thomasanderson@chromium.org>
Date: Tue Jan 15 03:20:32 2019

Remove build code related to the NDK's libc++

BUG= 767901 
R=thakis
TBR=dpranke

Change-Id: I890ee3dc9c1fb75784bbc470e4ffbf33cdb79f44
Reviewed-on: https://chromium-review.googlesource.com/c/1410281
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#622707}
[modify] https://crrev.com/e046b872aa1757eb3a9cb9a31a8b5c0e79cff729/build/android/BUILD.gn
[modify] https://crrev.com/e046b872aa1757eb3a9cb9a31a8b5c0e79cff729/build/config/android/BUILD.gn
[modify] https://crrev.com/e046b872aa1757eb3a9cb9a31a8b5c0e79cff729/build/config/android/rules.gni
[modify] https://crrev.com/e046b872aa1757eb3a9cb9a31a8b5c0e79cff729/testing/test.gni

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/a8d05eee4d9d3d8e519c9edd2e0e2a6ca1d5173b

commit a8d05eee4d9d3d8e519c9edd2e0e2a6ca1d5173b
Author: Tom Anderson <thomasanderson@chromium.org>
Date: Tue Jan 15 03:45:56 2019

Do TODOs related to Android/libc++ (src changes)

buildtools roll contains this revision:
https://chromium.googlesource.com/chromium/buildtools/+/40194ab03962d8183b2796fa58a39ec8a9e83a41

BUG= 767901 
R=thakis

Change-Id: I9969eb3338ff5e48187be609c2698ab08af80b67
Reviewed-on: https://chromium-review.googlesource.com/c/1410270
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#622716}
[modify] https://crrev.com/a8d05eee4d9d3d8e519c9edd2e0e2a6ca1d5173b/DEPS
[modify] https://crrev.com/a8d05eee4d9d3d8e519c9edd2e0e2a6ca1d5173b/base/BUILD.gn