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

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

Issue 1237393006: Only use the .cr.so product extension on Android in the component build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | no next file » | 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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 164
165 # Toolchain 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 174 if (component_mode == "shared_library") {
175 # loaded by the Android zygote. 175 # By appending .cr, we prevent name collisions with libraries already
176 android_product_extension = ".cr.so" 176 # loaded by the Android zygote.
177 android_product_extension = ".cr.so"
178 } else {
179 android_product_extension = ".so"
180 }
177 181
178 # ABI ------------------------------------------------------------------------ 182 # ABI ------------------------------------------------------------------------
179 183
180 if (current_cpu == "x86") { 184 if (current_cpu == "x86") {
181 android_app_abi = "x86" 185 android_app_abi = "x86"
182 } else if (current_cpu == "arm") { 186 } else if (current_cpu == "arm") {
183 import("//build/config/arm.gni") 187 import("//build/config/arm.gni")
184 if (arm_version < 7) { 188 if (arm_version < 7) {
185 android_app_abi = "armeabi" 189 android_app_abi = "armeabi"
186 } else { 190 } else {
187 android_app_abi = "armeabi-v7a" 191 android_app_abi = "armeabi-v7a"
188 } 192 }
189 } else if (current_cpu == "mipsel") { 193 } else if (current_cpu == "mipsel") {
190 android_app_abi = "mips" 194 android_app_abi = "mips"
191 } else if (current_cpu == "x64") { 195 } else if (current_cpu == "x64") {
192 android_app_abi = "x86_64" 196 android_app_abi = "x86_64"
193 } else if (current_cpu == "arm64") { 197 } else if (current_cpu == "arm64") {
194 android_app_abi = "arm64-v8a" 198 android_app_abi = "arm64-v8a"
195 } else if (current_cpu == "mips64el") { 199 } else if (current_cpu == "mips64el") {
196 android_app_abi = "mips64" 200 android_app_abi = "mips64"
197 } else { 201 } else {
198 assert(false, "Unknown Android ABI: " + current_cpu) 202 assert(false, "Unknown Android ABI: " + current_cpu)
199 } 203 }
200 } 204 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698