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

Side by Side Diff: build/config/compiler/BUILD.gn

Issue 695333003: Use thumb versions of external libraries with ARMv7. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« build/common.gypi ('K') | « build/config/android/config.gni ('k') | 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 (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 if (cpu_arch == "arm") { 6 if (cpu_arch == "arm") {
7 import("//build/config/arm.gni") 7 import("//build/config/arm.gni")
8 } 8 }
9 if (is_posix) { 9 if (is_posix) {
10 import("//build/config/gcc/gcc_version.gni") 10 import("//build/config/gcc/gcc_version.gni")
(...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after
476 # Think of them like system headers, but don't use '-isystem' because the 476 # Think of them like system headers, but don't use '-isystem' because the
477 # arm-linux-androideabi-4.4.3 toolchain (circa Gingerbread) will exhibit 477 # arm-linux-androideabi-4.4.3 toolchain (circa Gingerbread) will exhibit
478 # strange errors. The include ordering here is important; change with 478 # strange errors. The include ordering here is important; change with
479 # caution. 479 # caution.
480 android_stlport_root = "$android_ndk_root/sources/cxx-stl/stlport" 480 android_stlport_root = "$android_ndk_root/sources/cxx-stl/stlport"
481 481
482 cflags += [ 482 cflags += [
483 "-isystem" + rebase_path("$android_stlport_root/stlport", 483 "-isystem" + rebase_path("$android_stlport_root/stlport",
484 root_build_dir) 484 root_build_dir)
485 ] 485 ]
486 lib_dirs += [ "$android_stlport_root/libs/$android_app_abi" ] 486 if (arm_use_thumb) {
487 lib_dirs += [ "$android_stlport_root/libs/$android_app_abi/thumb" ]
488 } else {
489 lib_dirs += [ "$android_stlport_root/libs/$android_app_abi" ]
490 }
487 491
488 if (component_mode == "shared_library") { 492 if (component_mode == "shared_library") {
489 libs += [ "stlport_shared" ] 493 libs += [ "stlport_shared" ]
490 } else { 494 } else {
491 libs += [ "stlport_static" ] 495 libs += [ "stlport_static" ]
492 } 496 }
493 497
494 if (cpu_arch == "mipsel") { 498 if (cpu_arch == "mipsel") {
495 libs += [ 499 libs += [
496 # ld linker is used for mips Android, and ld does not accept library 500 # ld linker is used for mips Android, and ld does not accept library
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after
952 cflags += [ "-gsplit-dwarf" ] 956 cflags += [ "-gsplit-dwarf" ]
953 } 957 }
954 } 958 }
955 } 959 }
956 960
957 config("no_symbols") { 961 config("no_symbols") {
958 if (!is_win) { 962 if (!is_win) {
959 cflags = [ "-g0" ] 963 cflags = [ "-g0" ]
960 } 964 }
961 } 965 }
OLDNEW
« build/common.gypi ('K') | « build/config/android/config.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698