Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(138)

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: Add gn changes 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:
View side-by-side diff with in-line comments
Download patch
Index: build/config/android/config.gni
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
index a2de843053ef4ac6325155f8a1a0a2176b2f8723..9f93db1b56d0277b6dfc28be0ded75218b725e67 100644
--- a/build/config/android/config.gni
+++ b/build/config/android/config.gni
@@ -123,12 +123,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 ---------------------------------------------------------------
Fabrice (no longer in Chrome) 2014/11/05 12:33:06 Should we move this to build/compiler/BUILD.gn? Th
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 ------------------------------------------------------------------------

Powered by Google App Engine
This is Rietveld 408576698