| OLD | NEW |
| 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 import("//build/config/android/config.gni") |
| 5 import("//build/config/sanitizers/sanitizers.gni") | 6 import("//build/config/sanitizers/sanitizers.gni") |
| 6 | 7 |
| 7 # Config for us and everybody else depending on BoringSSL. | 8 # Config for us and everybody else depending on BoringSSL. |
| 8 config("openssl_config") { | 9 config("openssl_config") { |
| 9 defines = [ "OPENSSL_SMALL" ] | 10 defines = [ "OPENSSL_SMALL" ] |
| 10 include_dirs = [ "src/include" ] | 11 include_dirs = [ "src/include" ] |
| 11 if (is_component_build) { | 12 if (is_component_build) { |
| 12 defines += [ "BORINGSSL_SHARED_LIBRARY" ] | 13 defines += [ "BORINGSSL_SHARED_LIBRARY" ] |
| 13 } | 14 } |
| 14 } | 15 } |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 "//build/config/compiler:no_chromium_code", | 61 "//build/config/compiler:no_chromium_code", |
| 61 | 62 |
| 62 # TODO(davidben): Fix size_t truncations in BoringSSL. | 63 # TODO(davidben): Fix size_t truncations in BoringSSL. |
| 63 # https://crbug.com/429039 | 64 # https://crbug.com/429039 |
| 64 "//build/config/compiler:no_size_t_to_int_warning", | 65 "//build/config/compiler:no_size_t_to_int_warning", |
| 65 ] | 66 ] |
| 66 | 67 |
| 67 # Also gets the include dirs from :openssl_config | 68 # Also gets the include dirs from :openssl_config |
| 68 include_dirs = [ "src/include" ] | 69 include_dirs = [ "src/include" ] |
| 69 | 70 |
| 71 if (current_cpu == "arm" && is_clang) { |
| 72 # TODO(hans) Enable integrated-as (crbug.com/124610). |
| 73 rebased_android_toolchain_root = |
| 74 rebase_path(android_toolchain_root, root_build_dir) |
| 75 asmflags = [ |
| 76 "-fno-integrated-as", |
| 77 "-B${rebased_android_toolchain_root}/bin", # Else /usr/bin/as gets picked
up. |
| 78 ] |
| 79 } |
| 80 |
| 70 if (is_msan) { | 81 if (is_msan) { |
| 71 defines += [ "OPENSSL_NO_ASM" ] | 82 defines += [ "OPENSSL_NO_ASM" ] |
| 72 } else if (current_cpu == "x64") { | 83 } else if (current_cpu == "x64") { |
| 73 if (is_mac || is_ios) { | 84 if (is_mac || is_ios) { |
| 74 sources += gypi_values.boringssl_mac_x86_64_sources | 85 sources += gypi_values.boringssl_mac_x86_64_sources |
| 75 } else if (is_linux || is_android) { | 86 } else if (is_linux || is_android) { |
| 76 sources += gypi_values.boringssl_linux_x86_64_sources | 87 sources += gypi_values.boringssl_linux_x86_64_sources |
| 77 } else if (is_win) { | 88 } else if (is_win) { |
| 78 deps += [ ":boringssl_asm" ] | 89 deps += [ ":boringssl_asm" ] |
| 79 } else { | 90 } else { |
| (...skipping 14 matching lines...) Expand all Loading... |
| 94 } else if (current_cpu == "arm64" && (is_linux || is_android)) { | 105 } else if (current_cpu == "arm64" && (is_linux || is_android)) { |
| 95 sources += gypi_values.boringssl_linux_aarch64_sources | 106 sources += gypi_values.boringssl_linux_aarch64_sources |
| 96 } else { | 107 } else { |
| 97 defines += [ "OPENSSL_NO_ASM" ] | 108 defines += [ "OPENSSL_NO_ASM" ] |
| 98 } | 109 } |
| 99 | 110 |
| 100 if (is_nacl) { | 111 if (is_nacl) { |
| 101 deps += [ "//native_client_sdk/src/libraries/nacl_io" ] | 112 deps += [ "//native_client_sdk/src/libraries/nacl_io" ] |
| 102 } | 113 } |
| 103 } | 114 } |
| OLD | NEW |