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

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: Rebase to friending fixes 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:
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 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 ---------------------------------------------------------------
Fabrice (no longer in Chrome) 2015/02/04 13:24:23 I think this whole section can go to compiler/BUIL
jdduke (slow) 2015/02/05 18:37:15 Done.
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