Commit 5e671fff authored by Yury Khmel's avatar Yury Khmel Committed by Yury Khmel

Revert "Make transport security state generation part of the build."

This reverts commit 6ee4f021.

Reason for revert: 
This breaks Chrome PFQ with error:
chromeos-chrome-59.0.3067.0_rc-r1: ../../../../../../../home/chrome-bot/chrome_root/src/third_party/binutils/Linux_x64/Release/bin/ld.gold: error: cannot find -latomic



Original change's description:
> Make transport security state generation part of the build.
> 
> This CL adds a build step to generate transport_security_state_static.h
> when required.
> 
> Bug:595493
> 
> Change-Id: I478137a40d9107cbcc6470ee544bda66823ebbff
> Reviewed-on: https://chromium-review.googlesource.com/471529
> Reviewed-by: Lucas Garron <lgarron@chromium.org>
> Reviewed-by: Ryan Sleevi <rsleevi@chromium.org>
> Commit-Queue: Ryan Sleevi <rsleevi@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#463090}

TBR=rsleevi@chromium.org,peter@chromium.org,lgarron@chromium.org,martijn@martijnc.be,cbentzel+watch@chromium.org,net-reviews@chromium.org
# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: I84536c89c093531f1cf60cbdd4a3cfb2efbe5d80
Reviewed-on: https://chromium-review.googlesource.com/474009Reviewed-by: default avatarYury Khmel <khmel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#463428}
parent 4ef01ce3
...@@ -354,7 +354,6 @@ component("net") { ...@@ -354,7 +354,6 @@ component("net") {
"//base", "//base",
"//net/base/registry_controlled_domains", "//net/base/registry_controlled_domains",
"//net/data/ssl/wosign:wosign_domains", "//net/data/ssl/wosign:wosign_domains",
"//net/http:generate_transport_security_state",
"//third_party/protobuf:protobuf_lite", "//third_party/protobuf:protobuf_lite",
"//url:url_features", "//url:url_features",
] ]
......
...@@ -4,22 +4,6 @@ ...@@ -4,22 +4,6 @@
import("//build/compiled_action.gni") import("//build/compiled_action.gni")
compiled_action("generate_transport_security_state") {
tool = "//net/tools/transport_security_state_generator"
# Inputs in order expected by the command line of the tool.
inputs = [
"transport_security_state_static.json",
"transport_security_state_static.pins",
"transport_security_state_static.template",
]
outputs = [
"$target_gen_dir/transport_security_state_static.h",
]
args =
rebase_path(inputs, root_build_dir) + rebase_path(outputs, root_build_dir)
}
compiled_action_foreach("transport_security_state_unittest_data") { compiled_action_foreach("transport_security_state_unittest_data") {
tool = "//net/tools/transport_security_state_generator" tool = "//net/tools/transport_security_state_generator"
sources = [ sources = [
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment