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

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

Issue 772123003: Revert "Use thumb versions of external libraries with ARMv7." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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 | « 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 494 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 # NOTE: The stlport header include paths below are specified in cflags 505 # NOTE: The stlport header include paths below are specified in cflags
506 # rather than include_dirs because they need to come after include_dirs. 506 # rather than include_dirs because they need to come after include_dirs.
507 # Think of them like system headers, but don't use '-isystem' because the 507 # Think of them like system headers, but don't use '-isystem' because the
508 # arm-linux-androideabi-4.4.3 toolchain (circa Gingerbread) will exhibit 508 # arm-linux-androideabi-4.4.3 toolchain (circa Gingerbread) will exhibit
509 # strange errors. The include ordering here is important; change with 509 # strange errors. The include ordering here is important; change with
510 # caution. 510 # caution.
511 android_stlport_root = "$android_ndk_root/sources/cxx-stl/stlport" 511 android_stlport_root = "$android_ndk_root/sources/cxx-stl/stlport"
512 512
513 cflags += [ "-isystem" + 513 cflags += [ "-isystem" +
514 rebase_path("$android_stlport_root/stlport", root_build_dir) ] 514 rebase_path("$android_stlport_root/stlport", root_build_dir) ]
515 if (cpu_arch == "arm" && arm_use_thumb) { 515 lib_dirs += [ "$android_stlport_root/libs/$android_app_abi" ]
516 lib_dirs += [ "$android_stlport_root/libs/$android_app_abi/thumb" ]
517 } else {
518 lib_dirs += [ "$android_stlport_root/libs/$android_app_abi" ]
519 }
520 516
521 if (component_mode == "shared_library") { 517 if (component_mode == "shared_library") {
522 libs += [ "stlport_shared" ] 518 libs += [ "stlport_shared" ]
523 } else { 519 } else {
524 libs += [ "stlport_static" ] 520 libs += [ "stlport_static" ]
525 } 521 }
526 522
527 if (cpu_arch == "mipsel") { 523 if (cpu_arch == "mipsel") {
528 libs += [ 524 libs += [
529 # ld linker is used for mips Android, and ld does not accept library 525 # ld linker is used for mips Android, and ld does not accept library
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
975 cflags += [ "-gsplit-dwarf" ] 971 cflags += [ "-gsplit-dwarf" ]
976 } 972 }
977 } 973 }
978 } 974 }
979 975
980 config("no_symbols") { 976 config("no_symbols") {
981 if (!is_win) { 977 if (!is_win) {
982 cflags = [ "-g0" ] 978 cflags = [ "-g0" ]
983 } 979 }
984 } 980 }
OLDNEW
« no previous file with comments | « build/config/android/config.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698