Chromium Code Reviews| 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 # Config for us and everybody else depending on BoringSSL. | 5 # Config for us and everybody else depending on BoringSSL. |
| 6 config("openssl_config") { | 6 config("openssl_config") { |
| 7 include_dirs = [] | 7 include_dirs = [] |
| 8 include_dirs += [ "src/include" ] | 8 include_dirs += [ "src/include" ] |
| 9 } | 9 } |
| 10 | 10 |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 32 | 32 |
| 33 # Also gets the include dirs from :openssl_config | 33 # Also gets the include dirs from :openssl_config |
| 34 include_dirs = [ | 34 include_dirs = [ |
| 35 "src/include", | 35 "src/include", |
| 36 # This is for arm_arch.h, which is needed by some asm files. Since the | 36 # This is for arm_arch.h, which is needed by some asm files. Since the |
| 37 # asm files are generated and kept in a different directory, they | 37 # asm files are generated and kept in a different directory, they |
| 38 # cannot use relative paths to find this file. | 38 # cannot use relative paths to find this file. |
| 39 "src/crypto", | 39 "src/crypto", |
| 40 ] | 40 ] |
| 41 | 41 |
| 42 defines = [] | |
|
brettw
2014/07/24 22:21:36
I'd personally put this with the cflags at the top
scottmg
2014/07/24 22:22:43
Done.
| |
| 42 if (cpu_arch == "x64") { | 43 if (cpu_arch == "x64") { |
| 43 if (is_mac) { | 44 if (is_mac) { |
| 44 sources += gypi_values.boringssl_mac_x86_64_sources | 45 sources += gypi_values.boringssl_mac_x86_64_sources |
| 45 } else if (is_linux || is_android) { | 46 } else if (is_linux || is_android) { |
| 46 sources += gypi_values.boringssl_linux_x86_64_sources | 47 sources += gypi_values.boringssl_linux_x86_64_sources |
| 47 } else if (is_win) { | 48 } else if (is_win) { |
| 48 sources += gypi_values.boringssl_win_x86_64_sources | 49 sources += gypi_values.boringssl_win_x86_64_sources |
| 49 } else { | 50 } else { |
| 50 defines += [ "OPENSSL_NO_ASM" ] | 51 defines += [ "OPENSSL_NO_ASM" ] |
| 51 } | 52 } |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 67 if (!is_win) { | 68 if (!is_win) { |
| 68 configs -= [ "//build/config/gcc:symbol_visibility_hidden" ] | 69 configs -= [ "//build/config/gcc:symbol_visibility_hidden" ] |
| 69 } | 70 } |
| 70 if (is_posix && !is_mac) { | 71 if (is_posix && !is_mac) { |
| 71 # Avoid link failures on Linux x86-64. | 72 # Avoid link failures on Linux x86-64. |
| 72 # See http://rt.openssl.org/Ticket/Display.html?id=2466&user=guest&pass=gu est | 73 # See http://rt.openssl.org/Ticket/Display.html?id=2466&user=guest&pass=gu est |
| 73 ldflags += [ "-Wl,-Bsymbolic" ] | 74 ldflags += [ "-Wl,-Bsymbolic" ] |
| 74 } | 75 } |
| 75 } | 76 } |
| 76 } | 77 } |
| OLD | NEW |