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 import("//build/config/android/config.gni") | 5 import("//build/config/android/config.gni") |
| 6 import("//build/config/sanitizers/sanitizers.gni") | 6 import("//build/config/sanitizers/sanitizers.gni") |
| 7 import("//testing/libfuzzer/fuzzer_test.gni") | 7 import("//testing/libfuzzer/fuzzer_test.gni") |
| 8 | 8 |
| 9 # Config for us and everybody else depending on BoringSSL. | 9 # Config for us and everybody else depending on BoringSSL. |
| 10 config("external_config") { | 10 config("external_config") { |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 60 } | 60 } |
| 61 } | 61 } |
| 62 } else { | 62 } else { |
| 63 source_set("boringssl_asm") { | 63 source_set("boringssl_asm") { |
| 64 visibility = [ ":*" ] # Only targets in this file can depend on this. | 64 visibility = [ ":*" ] # Only targets in this file can depend on this. |
| 65 | 65 |
| 66 sources = [] | 66 sources = [] |
| 67 asmflags = [] | 67 asmflags = [] |
| 68 include_dirs = [ "src/include" ] | 68 include_dirs = [ "src/include" ] |
| 69 | 69 |
| 70 if (current_cpu == "arm" && is_clang) { | 70 if ((current_cpu == "arm" || current_cpu == "arm64") && is_clang) { |
| 71 # TODO(hans) Enable integrated-as (crbug.com/124610). | 71 if (current_cpu == "arm") { |
| 72 asmflags += [ "-fno-integrated-as" ] | 72 # TODO(hans) Enable integrated-as (crbug.com/124610). |
| 73 asmflags += [ "-fno-integrated-as" ] | |
| 74 } | |
| 73 if (is_android) { | 75 if (is_android) { |
| 74 rebased_android_toolchain_root = | 76 rebased_android_toolchain_root = |
| 75 rebase_path(android_toolchain_root, root_build_dir) | 77 rebase_path(android_toolchain_root, root_build_dir) |
| 76 | 78 |
| 77 # Else /usr/bin/as gets picked up. | 79 # Else /usr/bin/as gets picked up. |
| 78 asmflags += [ "-B${rebased_android_toolchain_root}/bin" ] | 80 asmflags += [ "-B${rebased_android_toolchain_root}/bin" ] |
|
Nico
2016/05/12 22:40:23
The only other thing this if does is add the -B fl
| |
| 79 } | 81 } |
| 80 } | 82 } |
| 81 | 83 |
| 82 if (is_msan) { | 84 if (is_msan) { |
| 83 public_configs = [ ":no_asm_config" ] | 85 public_configs = [ ":no_asm_config" ] |
| 84 } else if (current_cpu == "x64") { | 86 } else if (current_cpu == "x64") { |
| 85 if (is_mac || is_ios) { | 87 if (is_mac || is_ios) { |
| 86 sources += gypi_values.boringssl_mac_x86_64_sources | 88 sources += gypi_values.boringssl_mac_x86_64_sources |
| 87 } else if (is_linux || is_android) { | 89 } else if (is_linux || is_android) { |
| 88 sources += gypi_values.boringssl_linux_x86_64_sources | 90 sources += gypi_values.boringssl_linux_x86_64_sources |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 183 | 185 |
| 184 fuzzer_test("boringssl_server_bio_write_fuzzer") { | 186 fuzzer_test("boringssl_server_bio_write_fuzzer") { |
| 185 sources = [ | 187 sources = [ |
| 186 "src/fuzz/server.cc", | 188 "src/fuzz/server.cc", |
| 187 ] | 189 ] |
| 188 deps = [ | 190 deps = [ |
| 189 ":boringssl_fuzzer", | 191 ":boringssl_fuzzer", |
| 190 ] | 192 ] |
| 191 seed_corpus = "src/fuzz/server_corpus" | 193 seed_corpus = "src/fuzz/server_corpus" |
| 192 } | 194 } |
| OLD | NEW |