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

Side by Side 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, 10 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 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 = 8 has_chrome_android_internal =
9 exec_script("//build/dir_exists.py", 9 exec_script("//build/dir_exists.py",
10 [ rebase_path("//clank", root_build_dir) ], 10 [ rebase_path("//clank", root_build_dir) ],
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 } else { 122 } else {
123 assert(false, "Need android libgcc support for your target arch.") 123 assert(false, "Need android libgcc support for your target arch.")
124 } 124 }
125 125
126 android_tool_prefix = "$android_toolchain_root/bin/$_binary_prefix-" 126 android_tool_prefix = "$android_toolchain_root/bin/$_binary_prefix-"
127 android_readelf = "${android_tool_prefix}readelf" 127 android_readelf = "${android_tool_prefix}readelf"
128 android_objcopy = "${android_tool_prefix}objcopy" 128 android_objcopy = "${android_tool_prefix}objcopy"
129 android_gdbserver = 129 android_gdbserver =
130 "$android_ndk_root/prebuilt/$android_prebuilt_arch/gdbserver/gdbserver" 130 "$android_ndk_root/prebuilt/$android_prebuilt_arch/gdbserver/gdbserver"
131 131
132 # stlport stuff -------------------------------------------------------------- 132 # 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.
133 133
134 if (component_mode == "shared_library") { 134 if (component_mode == "shared_library") {
135 android_stlport_library = "stlport_shared" 135 android_libcpp_library = "c++_shared"
136 } else { 136 } else {
137 android_stlport_library = "stlport_static" 137 android_libcpp_library = "c++_static"
138 } 138 }
139 139
140 # ABI ------------------------------------------------------------------------ 140 # ABI ------------------------------------------------------------------------
141 141
142 if (cpu_arch == "x86") { 142 if (cpu_arch == "x86") {
143 android_app_abi = "x86" 143 android_app_abi = "x86"
144 } else if (cpu_arch == "arm") { 144 } else if (cpu_arch == "arm") {
145 import("//build/config/arm.gni") 145 import("//build/config/arm.gni")
146 if (arm_version < 7) { 146 if (arm_version < 7) {
147 android_app_abi = "armeabi" 147 android_app_abi = "armeabi"
148 } else { 148 } else {
149 android_app_abi = "armeabi-v7a" 149 android_app_abi = "armeabi-v7a"
150 } 150 }
151 } else if (cpu_arch == "mipsel") { 151 } else if (cpu_arch == "mipsel") {
152 android_app_abi = "mips" 152 android_app_abi = "mips"
153 } else { 153 } else {
154 assert(false, "Unknown Android ABI: " + cpu_arch) 154 assert(false, "Unknown Android ABI: " + cpu_arch)
155 } 155 }
156 } else { 156 } else {
157 if (!defined(is_android_webview_build)) { 157 if (!defined(is_android_webview_build)) {
158 is_android_webview_build = false 158 is_android_webview_build = false
159 } 159 }
160 } 160 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698