We have a bug to upstream this but for now we should just apply the patch to the in-tree version: https://chromium-review.googlesource.com/c/android_ndk/+/797450.

Let us know if you'd like us to take that on.

Thanks estevenson!  That certainly explains the binary size regression.

Looks like there are 2 patches that need to be upstreamed:
https://chromium.googlesource.com/android_ndk/+/master/chromium-patches/Lower-std-deque-block-size.patch
https://chromium.googlesource.com/android_ndk/+/master/chromium-patches/CHROMIUM_CXX_TWEAK_INLINES.patch

The 2nd one would require reworking for it to be upstreamed.  Could you link the bug for that?

Also +thakis and pcc for Android libc++

The deque one is "just" memory use; there's a crbug linking to an upstream bug with discussion somewhere. When that landed, I told dskiba that it'll be lost unless upstreamed and it got merged with that understanding, so that's not a hard blocker.

Namely, Issue 674287.

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

+agrieve, I can't find the bug about upstreaming?

I think the one I had in mind was, in fact,  bug 767901  (although it doesn't explicitly mention the task). I've filed  bug 846855  to specifically track upstreaming CHROMIUM_CXX_TWEAK_INLINES.patch

My thinking was that I couldn't try to upstream it until we were building against tip-of-tree libc++ anyways.

Binary size regression should be fixed now that the CL has been reverted.

Reopening to request merge for 68.

And the request is for the revert CL in #6.

This bug requires manual review: Reverts referenced in bugdroid comments after merge request.
Please contact the milestone owner if you have questions.
Owners: cmasso@(Android), kariahda@(iOS), bhthompson@(ChromeOS), abdulsyed@(Desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

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