build/config/android/config.gni - Issue 691783003: [WIP NOT FOR COMMIT] Switch Android to libc++

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 691783003: [WIP NOT FOR COMMIT] Switch Android to libc++ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Review comments Created 6 years, 1 month 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 ce9a175e73d43e5191c9303f466900fcbe092e6d..f026c07e342b87456ce6db93abff9b230ede4a55 100644

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

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

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

android_objcopy = "${android_tool_prefix}objcopy"

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"

}

} else {

if (!defined(is_android_webview_build)) {