 Chromium Code Reviews
 Chromium Code Reviews Issue 2574413002:
  Make static (preloaded) security state generation part of the build process.  (Closed)
    
  
    Issue 2574413002:
  Make static (preloaded) security state generation part of the build process.  (Closed) 
  | OLD | NEW | 
|---|---|
| 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/buildflag_header.gni") | 5 import("//build/buildflag_header.gni") | 
| 6 import("//build/compiled_action.gni") | |
| 6 import("//build/config/chromecast_build.gni") | 7 import("//build/config/chromecast_build.gni") | 
| 7 import("//build/config/compiler/compiler.gni") | 8 import("//build/config/compiler/compiler.gni") | 
| 8 import("//build/config/crypto.gni") | 9 import("//build/config/crypto.gni") | 
| 9 import("//build/config/features.gni") | 10 import("//build/config/features.gni") | 
| 10 import("//build/config/ui.gni") | 11 import("//build/config/ui.gni") | 
| 11 import("//net/features.gni") | 12 import("//net/features.gni") | 
| 12 import("//testing/libfuzzer/fuzzer_test.gni") | 13 import("//testing/libfuzzer/fuzzer_test.gni") | 
| 13 import("//testing/test.gni") | 14 import("//testing/test.gni") | 
| 14 import("//third_party/icu/config.gni") | 15 import("//third_party/icu/config.gni") | 
| 15 import("//third_party/protobuf/proto_library.gni") | 16 import("//third_party/protobuf/proto_library.gni") | 
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 113 ":net_quic_proto", | 114 ":net_quic_proto", | 
| 114 "//crypto", | 115 "//crypto", | 
| 115 "//crypto:platform", | 116 "//crypto:platform", | 
| 116 ] | 117 ] | 
| 117 | 118 | 
| 118 if (!is_nacl) { | 119 if (!is_nacl) { | 
| 119 sources += gypi_values.net_non_nacl_sources | 120 sources += gypi_values.net_non_nacl_sources | 
| 120 | 121 | 
| 121 deps += [ | 122 deps += [ | 
| 122 "//base/third_party/dynamic_annotations", | 123 "//base/third_party/dynamic_annotations", | 
| 124 "//net:generate_preload_domain_security_state", | |
| 
Ryan Sleevi
2016/12/15 01:39:35
The problem here is that net/http/transport_securi
 
martijnc
2016/12/16 22:32:45
Thanks for your feedback! I'll go for Option 1 and
 | |
| 123 "//sdch", | 125 "//sdch", | 
| 124 "//third_party/zlib", | 126 "//third_party/zlib", | 
| 125 ] | 127 ] | 
| 126 | 128 | 
| 127 if (!use_kerberos) { | 129 if (!use_kerberos) { | 
| 128 sources -= [ | 130 sources -= [ | 
| 129 "http/http_auth_handler_negotiate.cc", | 131 "http/http_auth_handler_negotiate.cc", | 
| 130 "http/http_auth_handler_negotiate.h", | 132 "http/http_auth_handler_negotiate.h", | 
| 131 ] | 133 ] | 
| 132 } | 134 } | 
| (...skipping 1944 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2077 if (host_toolchain == current_toolchain) { | 2079 if (host_toolchain == current_toolchain) { | 
| 2078 executable("domain_security_preload_generator") { | 2080 executable("domain_security_preload_generator") { | 
| 2079 sources = gypi_values.net_domain_security_state_generator_sources | 2081 sources = gypi_values.net_domain_security_state_generator_sources | 
| 2080 deps = [ | 2082 deps = [ | 
| 2081 "//base", | 2083 "//base", | 
| 2082 "//crypto", | 2084 "//crypto", | 
| 2083 "//third_party/boringssl", | 2085 "//third_party/boringssl", | 
| 2084 ] | 2086 ] | 
| 2085 } | 2087 } | 
| 2086 } | 2088 } | 
| 2089 | |
| 2090 compiled_action("generate_preload_domain_security_state") { | |
| 2091 tool = "//net:domain_security_preload_generator" | |
| 2092 inputs = [ | |
| 2093 "http/transport_security_state_static.json", | |
| 2094 "http/transport_security_state_static.pins", | |
| 2095 ] | |
| 2096 outputs = [ | |
| 2097 "$target_gen_dir/http/transport_security_state_static.h", | |
| 2098 ] | |
| 2099 args = [ | |
| 2100 rebase_path("http/transport_security_state_static.json", root_build_dir), | |
| 2101 rebase_path("http/transport_security_state_static.pins", root_build_dir), | |
| 2102 rebase_path( | |
| 2103 "tools/domain_security_preload_generator/resources/transport_security_st ate_static.template", | |
| 2104 root_build_dir), | |
| 2105 rebase_path("$target_gen_dir/http/transport_security_state_static.h", | |
| 2106 root_build_dir), | |
| 2107 ] | |
| 2108 } | |
| OLD | NEW |