| OLD | NEW |
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 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 import("//build/config/android/config.gni") | 5 import("//build/config/android/config.gni") |
| 6 import("//build/config/chrome_build.gni") | 6 import("//build/config/chrome_build.gni") |
| 7 if (current_cpu == "arm") { | 7 if (current_cpu == "arm") { |
| 8 import("//build/config/arm.gni") | 8 import("//build/config/arm.gni") |
| 9 } | 9 } |
| 10 if (current_cpu == "mipsel" || current_cpu == "mips64el") { | 10 if (current_cpu == "mipsel" || current_cpu == "mips64el") { |
| (...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 263 common_mac_flags += [ | 263 common_mac_flags += [ |
| 264 "-arch", | 264 "-arch", |
| 265 "x86_64", | 265 "x86_64", |
| 266 ] | 266 ] |
| 267 } else if (current_cpu == "x86") { | 267 } else if (current_cpu == "x86") { |
| 268 common_mac_flags += [ | 268 common_mac_flags += [ |
| 269 "-arch", | 269 "-arch", |
| 270 "i386", | 270 "i386", |
| 271 ] | 271 ] |
| 272 } else if (current_cpu == "arm") { | 272 } else if (current_cpu == "arm") { |
| 273 # TODO(GYP): we may need to distinguish between "arm64", "armv7", |
| 274 # and "armv7s" for iOS, and hence need multiple current_cpu values |
| 275 # rather than just "arm". |
| 273 common_mac_flags += [ | 276 common_mac_flags += [ |
| 274 "-arch", | 277 "-arch", |
| 275 "armv7", | 278 "arm64", |
| 276 ] | 279 ] |
| 277 } | 280 } |
| 278 | 281 |
| 279 cflags += common_mac_flags | 282 cflags += common_mac_flags |
| 280 | 283 |
| 281 # Without this, the constructors and destructors of a C++ object inside | 284 # Without this, the constructors and destructors of a C++ object inside |
| 282 # an Objective C struct won't be called, which is very bad. | 285 # an Objective C struct won't be called, which is very bad. |
| 283 cflags_objcc += [ "-fobjc-call-cxx-cdtors" ] | 286 cflags_objcc += [ "-fobjc-call-cxx-cdtors" ] |
| 284 | 287 |
| 285 cflags_c += [ "-std=c99" ] | 288 cflags_c += [ "-std=c99" ] |
| (...skipping 995 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1281 cflags += [ "-gsplit-dwarf" ] | 1284 cflags += [ "-gsplit-dwarf" ] |
| 1282 } | 1285 } |
| 1283 } | 1286 } |
| 1284 } | 1287 } |
| 1285 | 1288 |
| 1286 config("no_symbols") { | 1289 config("no_symbols") { |
| 1287 if (!is_win) { | 1290 if (!is_win) { |
| 1288 cflags = [ "-g0" ] | 1291 cflags = [ "-g0" ] |
| 1289 } | 1292 } |
| 1290 } | 1293 } |
| OLD | NEW |