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

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: 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 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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 "$android_toolchain_root/lib/gcc/mipsel-linux-android/${_android_toolchain _version}/libgcc.a" 116 "$android_toolchain_root/lib/gcc/mipsel-linux-android/${_android_toolchain _version}/libgcc.a"
117 } else { 117 } else {
118 assert(false, "Need android libgcc support for your target arch.") 118 assert(false, "Need android libgcc support for your target arch.")
119 } 119 }
120 120
121 android_tool_prefix = "$android_toolchain_root/bin/$_binary_prefix-" 121 android_tool_prefix = "$android_toolchain_root/bin/$_binary_prefix-"
122 android_readelf = "${android_tool_prefix}readelf" 122 android_readelf = "${android_tool_prefix}readelf"
123 android_objcopy = "${android_tool_prefix}objcopy" 123 android_objcopy = "${android_tool_prefix}objcopy"
124 android_gdbserver = "$android_ndk_root/prebuilt/$android_prebuilt_arch/gdbserv er/gdbserver" 124 android_gdbserver = "$android_ndk_root/prebuilt/$android_prebuilt_arch/gdbserv er/gdbserver"
125 125
126 # stlport stuff -------------------------------------------------------------- 126 # Libc++ stuff ---------------------------------------------------------------
Fabrice (no longer in Chrome) 2014/11/05 12:33:06 Should we move this to build/compiler/BUILD.gn? Th
127 127
128 if (component_mode == "shared_library") { 128 if (component_mode == "shared_library") {
129 android_stlport_library = "stlport_shared" 129 android_libcpp_library = "c++_shared"
130 } else { 130 } else {
131 android_stlport_library = "stlport_static" 131 android_libcpp_library = "c++_static"
132 } 132 }
133 133
134 # ABI ------------------------------------------------------------------------ 134 # ABI ------------------------------------------------------------------------
135 135
136 if (cpu_arch == "x86") { 136 if (cpu_arch == "x86") {
137 android_app_abi = "x86" 137 android_app_abi = "x86"
138 } else if (cpu_arch == "arm") { 138 } else if (cpu_arch == "arm") {
139 import("//build/config/arm.gni") 139 import("//build/config/arm.gni")
140 if (arm_version < 7) { 140 if (arm_version < 7) {
141 android_app_abi = "armeabi" 141 android_app_abi = "armeabi"
142 } else { 142 } else {
143 android_app_abi = "armeabi-v7a" 143 android_app_abi = "armeabi-v7a"
144 } 144 }
145 } else if (cpu_arch == "mipsel") { 145 } else if (cpu_arch == "mipsel") {
146 android_app_abi = "mips" 146 android_app_abi = "mips"
147 } else { 147 } else {
148 assert(false, "Unknown Android ABI: " + cpu_arch) 148 assert(false, "Unknown Android ABI: " + cpu_arch)
149 } 149 }
150 } else { 150 } else {
151 if (!defined(is_android_webview_build)) { 151 if (!defined(is_android_webview_build)) {
152 is_android_webview_build = false 152 is_android_webview_build = false
153 } 153 }
154 } 154 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698