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

Side by Side Diff: build/config/android/config.gni

Issue 1236543004: GN (android): Append ".cr" to component .so's to avoid zygote lib collisions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn16
Patch Set: android_shared_library_extension -> android_product_extension (to match GYP) Created 5 years, 5 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
« no previous file with comments | « no previous file | build/config/android/rules.gni » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 } else { 155 } else {
156 assert(false, "Need android libgcc support for your target arch.") 156 assert(false, "Need android libgcc support for your target arch.")
157 } 157 }
158 158
159 android_tool_prefix = "$android_toolchain_root/bin/$_binary_prefix-" 159 android_tool_prefix = "$android_toolchain_root/bin/$_binary_prefix-"
160 android_readelf = "${android_tool_prefix}readelf" 160 android_readelf = "${android_tool_prefix}readelf"
161 android_objcopy = "${android_tool_prefix}objcopy" 161 android_objcopy = "${android_tool_prefix}objcopy"
162 android_gdbserver = 162 android_gdbserver =
163 "$android_ndk_root/prebuilt/$android_prebuilt_arch/gdbserver/gdbserver" 163 "$android_ndk_root/prebuilt/$android_prebuilt_arch/gdbserver/gdbserver"
164 164
165 # libc++ stuff --------------------------------------------------------------- 165 # Toolchain stuff ------------------------------------------------------------
166 166
167 android_libcpp_root = "$android_ndk_root/sources/cxx-stl/llvm-libc++" 167 android_libcpp_root = "$android_ndk_root/sources/cxx-stl/llvm-libc++"
168 if (component_mode == "shared_library") { 168 if (component_mode == "shared_library") {
169 android_libcpp_library = "c++_shared" 169 android_libcpp_library = "c++_shared"
170 } else { 170 } else {
171 android_libcpp_library = "c++_static" 171 android_libcpp_library = "c++_static"
172 } 172 }
173 173
174 # By appending .cr, we prevent name collisions with libraries already
175 # loaded by the Android zygote.
176 android_product_extension = ".cr.so"
177
174 # ABI ------------------------------------------------------------------------ 178 # ABI ------------------------------------------------------------------------
175 179
176 if (current_cpu == "x86") { 180 if (current_cpu == "x86") {
177 android_app_abi = "x86" 181 android_app_abi = "x86"
178 } else if (current_cpu == "arm") { 182 } else if (current_cpu == "arm") {
179 import("//build/config/arm.gni") 183 import("//build/config/arm.gni")
180 if (arm_version < 7) { 184 if (arm_version < 7) {
181 android_app_abi = "armeabi" 185 android_app_abi = "armeabi"
182 } else { 186 } else {
183 android_app_abi = "armeabi-v7a" 187 android_app_abi = "armeabi-v7a"
184 } 188 }
185 } else if (current_cpu == "mipsel") { 189 } else if (current_cpu == "mipsel") {
186 android_app_abi = "mips" 190 android_app_abi = "mips"
187 } else if (current_cpu == "x64") { 191 } else if (current_cpu == "x64") {
188 android_app_abi = "x86_64" 192 android_app_abi = "x86_64"
189 } else if (current_cpu == "arm64") { 193 } else if (current_cpu == "arm64") {
190 android_app_abi = "arm64-v8a" 194 android_app_abi = "arm64-v8a"
191 } else if (current_cpu == "mips64el") { 195 } else if (current_cpu == "mips64el") {
192 android_app_abi = "mips64" 196 android_app_abi = "mips64"
193 } else { 197 } else {
194 assert(false, "Unknown Android ABI: " + current_cpu) 198 assert(false, "Unknown Android ABI: " + current_cpu)
195 } 199 }
196 } 200 }
OLDNEW
« no previous file with comments | « no previous file | build/config/android/rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698