build/config/android/config.gni - 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: build/config/android/config.gni

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

Patch Set: Really fix AOSP 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: build/config/android/config.gni

diff --git a/build/config/android/config.gni b/build/config/android/config.gni

index 60934c2e0b54a5300681e87663e1b16b43d00ca6..763f999745f3dc39a9407fa8632eaf36d3ba29ad 100644

--- a/build/config/android/config.gni

+++ b/build/config/android/config.gni

@@ -129,12 +129,12 @@ if (is_android) {

android_gdbserver =

"$android_ndk_root/prebuilt/$android_prebuilt_arch/gdbserver/gdbserver"

- # stlport stuff --------------------------------------------------------------

+ # Libc++ stuff ---------------------------------------------------------------

if (component_mode == "shared_library") {

- android_stlport_library = "stlport_shared"

+ android_libcpp_library = "c++_shared"

} else {

- android_stlport_library = "stlport_static"

+ android_libcpp_library = "c++_static"

}

# ABI ------------------------------------------------------------------------