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

Side by Side 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:
View unified diff | Download patch
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # This file contains common system config stuff for the Android build. 5 # This file contains common system config stuff for the Android build.
6 6
7 if (is_android) { 7 if (is_android) {
8 has_chrome_android_internal = exec_script("//build/dir_exists.py", 8 has_chrome_android_internal = exec_script("//build/dir_exists.py",
9 [ rebase_path("//clank", root_build_dir) ], 9 [ rebase_path("//clank", root_build_dir) ],
10 "string") == "True" 10 "string") == "True"
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 "$android_toolchain_root/lib/gcc/mipsel-linux-android/${_android_toolchain _version}/libgcc.a" 138 "$android_toolchain_root/lib/gcc/mipsel-linux-android/${_android_toolchain _version}/libgcc.a"
139 } else { 139 } else {
140 assert(false, "Need android libgcc support for your target arch.") 140 assert(false, "Need android libgcc support for your target arch.")
141 } 141 }
142 142
143 android_tool_prefix = "$android_toolchain_root/bin/$_binary_prefix-" 143 android_tool_prefix = "$android_toolchain_root/bin/$_binary_prefix-"
144 android_readelf = "${android_tool_prefix}readelf" 144 android_readelf = "${android_tool_prefix}readelf"
145 android_objcopy = "${android_tool_prefix}objcopy" 145 android_objcopy = "${android_tool_prefix}objcopy"
146 android_gdbserver = "$android_ndk_root/prebuilt/$android_prebuilt_arch/gdbserv er/gdbserver" 146 android_gdbserver = "$android_ndk_root/prebuilt/$android_prebuilt_arch/gdbserv er/gdbserver"
147 147
148 # stlport stuff -------------------------------------------------------------- 148 # Libc++ stuff ---------------------------------------------------------------
149 149
150 if (component_mode == "shared_library") { 150 if (component_mode == "shared_library") {
151 android_stlport_library = "stlport_shared" 151 android_libcpp_library = "c++_shared"
152 } else { 152 } else {
153 android_stlport_library = "stlport_static" 153 android_libcpp_library = "c++_static"
154 } 154 }
155 } else { 155 } else {
156 if (!defined(is_android_webview_build)) { 156 if (!defined(is_android_webview_build)) {
157 is_android_webview_build = false 157 is_android_webview_build = false
158 } 158 }
159 } 159 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698