Move uri_template to its own individual BUILD.gn
uri_template is a third_party library which should have its own BUILD.gn file, in order for the licensing to correctly identify that this is a third_party, it needs to live in its own BUILD.gn with its own target. This is also impacting Cronet in AOSP where the license is not being forwarded correctly since it lives with base Bug: 358541596 Change-Id: I34ca521b1bab6c7c6004f9d3e2349be76619e333 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5809380 Auto-Submit: Mohannad Farrag <aymanm@google.com> Reviewed-by: Adam Rice <ricea@chromium.org> Commit-Queue: Mohannad Farrag <aymanm@google.com> Cr-Commit-Position: refs/heads/main@{#1347282}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
1c71f6f805
commit
59e2d74b83
@ -36,6 +36,7 @@
|
||||
//net/dns/public
|
||||
//net/http
|
||||
//net/third_party/quiche
|
||||
//net/third_party/uri_template
|
||||
//net/traffic_annotation
|
||||
//third_party/abseil-cpp
|
||||
//third_party/android_build_tools
|
||||
|
27
net/BUILD.gn
27
net/BUILD.gn
@ -1794,11 +1794,11 @@ source_set("net_public_deps") {
|
||||
public_deps = [
|
||||
":buildflags",
|
||||
":net_nqe_proto",
|
||||
":uri_template",
|
||||
"//base",
|
||||
"//crypto",
|
||||
"//net/third_party/quiche",
|
||||
"//net/third_party/quiche:net_quic_test_tools_proto",
|
||||
"//net/third_party/uri_template",
|
||||
"//net/traffic_annotation",
|
||||
"//third_party/boringssl",
|
||||
"//url",
|
||||
@ -1809,19 +1809,6 @@ source_set("net_public_deps") {
|
||||
}
|
||||
}
|
||||
|
||||
component("uri_template") {
|
||||
sources = [
|
||||
"third_party/uri_template/uri_template.cc",
|
||||
"third_party/uri_template/uri_template.h",
|
||||
]
|
||||
visibility = [
|
||||
":net_public_deps",
|
||||
"//net/third_party/quiche",
|
||||
]
|
||||
defines = [ "IS_URI_TEMPLATE_IMPL" ]
|
||||
public_deps = [ "//base" ]
|
||||
}
|
||||
|
||||
grit("net_resources") {
|
||||
source = "base/net_resources.grd"
|
||||
outputs = [
|
||||
@ -2869,7 +2856,6 @@ test("net_unittests") {
|
||||
"test/embedded_test_server/http_request_unittest.cc",
|
||||
"test/embedded_test_server/http_response_unittest.cc",
|
||||
"test/run_all_unittests.cc",
|
||||
"third_party/uri_template/uri_template_test.cc",
|
||||
"tools/content_decoder_tool/content_decoder_tool.cc",
|
||||
"tools/content_decoder_tool/content_decoder_tool.h",
|
||||
"tools/content_decoder_tool/content_decoder_tool_unittest.cc",
|
||||
@ -2980,6 +2966,7 @@ test("net_unittests") {
|
||||
"//net/http:transport_security_state_unittest_data",
|
||||
"//net/http:transport_security_state_unittest_data_default",
|
||||
"//net/third_party/quiche:quiche_tests",
|
||||
"//net/third_party/uri_template:uri_template_tests",
|
||||
"//net/tools/huffman_trie:huffman_trie_generator_sources",
|
||||
"//testing/gmock",
|
||||
"//testing/gtest",
|
||||
@ -4003,16 +3990,6 @@ fuzzer_test("net_quic_session_pool_fuzzer") {
|
||||
]
|
||||
}
|
||||
|
||||
fuzzer_test("net_uri_template_fuzzer") {
|
||||
sources = [ "third_party/uri_template/uri_template_fuzzer.cc" ]
|
||||
deps = [
|
||||
":net_fuzzer_test_support",
|
||||
"//base",
|
||||
"//net",
|
||||
]
|
||||
dict = "data/fuzzer_dictionaries/net_uri_template_fuzzer.dict"
|
||||
}
|
||||
|
||||
if (is_linux || is_chromeos) {
|
||||
fuzzer_test("net_base_address_tracker_linux_fuzzer") {
|
||||
sources = [ "base/address_tracker_linux_fuzzer.cc" ]
|
||||
|
2
net/third_party/quiche/BUILD.gn
vendored
2
net/third_party/quiche/BUILD.gn
vendored
@ -80,7 +80,7 @@ component("quiche") {
|
||||
all_dependent_configs = [ ":quiche_config" ]
|
||||
|
||||
deps = [
|
||||
"//net:uri_template",
|
||||
"//net/third_party/uri_template",
|
||||
"//third_party/protobuf:protobuf_lite",
|
||||
"//third_party/zlib",
|
||||
]
|
||||
|
38
net/third_party/uri_template/BUILD.gn
vendored
Normal file
38
net/third_party/uri_template/BUILD.gn
vendored
Normal file
@ -0,0 +1,38 @@
|
||||
# Copyright 2024 The Chromium Authors
|
||||
# Use of this source code is governed by a BSD-style license that can be
|
||||
# found in the LICENSE file.
|
||||
import("//testing/libfuzzer/fuzzer_test.gni")
|
||||
|
||||
component("uri_template") {
|
||||
sources = [
|
||||
"uri_template.cc",
|
||||
"uri_template.h",
|
||||
]
|
||||
visibility = [
|
||||
":uri_template_tests",
|
||||
"//net:net_public_deps",
|
||||
"//net/third_party/quiche",
|
||||
]
|
||||
defines = [ "IS_URI_TEMPLATE_IMPL" ]
|
||||
public_deps = [ "//base" ]
|
||||
}
|
||||
|
||||
source_set("uri_template_tests") {
|
||||
testonly = true
|
||||
sources = [ "uri_template_test.cc" ]
|
||||
deps = [
|
||||
":uri_template",
|
||||
"//testing/gmock",
|
||||
"//testing/gtest",
|
||||
]
|
||||
}
|
||||
|
||||
fuzzer_test("net_uri_template_fuzzer") {
|
||||
sources = [ "uri_template_fuzzer.cc" ]
|
||||
deps = [
|
||||
"//base",
|
||||
"//net",
|
||||
"//net:net_fuzzer_test_support",
|
||||
]
|
||||
dict = "//net/data/fuzzer_dictionaries/net_uri_template_fuzzer.dict"
|
||||
}
|
Reference in New Issue
Block a user