Skip to content

Commit

Permalink
Move SSL certificates content into Starboard (#4085)
Browse files Browse the repository at this point in the history
This removes a reverse dependency from Starboard to Cobalt.

b/364421874
b/278599663
  • Loading branch information
kaidokert authored Sep 5, 2024
1 parent 00284dd commit 13e5773
Show file tree
Hide file tree
Showing 148 changed files with 169 additions and 156 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ repos:
(?x)^(
(internal/)?starboard/[^/]+/i18n/|
cobalt/content/licenses/|
cobalt/content/ssl/|
cobalt/fetch/embedded_scripts|
cobalt/streams/embedded_scripts|
cobalt/loader/cors_preflight.cc|
internal/cobalt/browser/splash_screen/youtube_splash_screen.html|
internal/starboard/shared/playstation/storage_internal.cc|
starboard/content/ssl/certs/|
starboard/loader_app/app_key_test.cc|
starboard/shared/starboard/player/testdata|
starboard/shared/win32/media_transform.cc
Expand Down
2 changes: 1 addition & 1 deletion base/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3667,7 +3667,7 @@ test("base_unittests") {
if (is_starboard){
data_deps += [
":base_unittests_bundle_data",
"//cobalt/network:copy_ssl_certificates",
"//starboard/content/ssl:copy_ssl_certificates",
]
}

Expand Down
2 changes: 1 addition & 1 deletion cobalt/base/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -130,5 +130,5 @@ target(gtest_target_type, "base_test") {
"//testing/gmock",
"//testing/gtest",
]
data_deps = [ "//cobalt/network:copy_ssl_certificates" ]
data_deps = [ "//starboard/content/ssl:copy_ssl_certificates" ]
}
2 changes: 1 addition & 1 deletion cobalt/browser/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ target(final_executable_type, "cobalt") {
"//cobalt/css_parser",
"//net",
]
data_deps = [ "//cobalt/network:copy_ssl_certificates" ]
data_deps = [ "//starboard/content/ssl:copy_ssl_certificates" ]
if (cobalt_font_package == "empty") {
data_deps += [ "//starboard/content/fonts:copy_font_data" ]
} else {
Expand Down
2 changes: 1 addition & 1 deletion cobalt/encoding/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,5 @@ target(gtest_target_type, "text_encoding_test") {
"//testing/gtest",
]

data_deps = [ "//cobalt/network:copy_ssl_certificates" ]
data_deps = [ "//starboard/content/ssl:copy_ssl_certificates" ]
}
2 changes: 1 addition & 1 deletion cobalt/layout_tests/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ target(gtest_target_type, "layout_tests") {

data_deps = [
"//cobalt/layout_tests/testdata:layout_copy_test_data",
"//cobalt/network:copy_ssl_certificates",
"//starboard/content/ssl:copy_ssl_certificates",
]
if (cobalt_font_package == "empty") {
data_deps += [ "//starboard/content/fonts:copy_font_data" ]
Expand Down
11 changes: 1 addition & 10 deletions cobalt/network/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import("//cobalt/network/certs.gni")

# TODO: b/330221826 Change to |public_configs| with matching dependencies.
config("network_all_dependent_config") {
# Enable network logging on all but gold builds.
Expand Down Expand Up @@ -85,14 +83,14 @@ static_library("network") {
public_deps = [ "//net" ]

deps = [
":copy_ssl_certificates",
"//cobalt/base",
"//cobalt/build:cobalt_build_id",
"//cobalt/configuration",
"//cobalt/network_bridge",
"//cobalt/persistent_storage:persistent_settings",
"//cobalt/storage",
"//starboard/common",
"//starboard/content/ssl:copy_ssl_certificates",
"//third_party/protobuf:protobuf_lite",
"//url",
]
Expand Down Expand Up @@ -123,13 +121,6 @@ static_library("network") {
all_dependent_configs = [ ":network_all_dependent_config" ]
}

copy("copy_ssl_certificates") {
install_content = true
sources = network_certs
outputs =
[ "$sb_static_contents_output_data_dir/ssl/certs/{{source_file_part}}" ]
}

target(gtest_target_type, "network_test") {
testonly = true
has_pedantic_warnings = true
Expand Down
135 changes: 0 additions & 135 deletions cobalt/network/certs.gni

This file was deleted.

2 changes: 1 addition & 1 deletion net/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3075,7 +3075,7 @@ test("net_unittests") {
data_deps += [
":net_unittest_files",
":third_party_unittest_files",
"//cobalt/network:copy_ssl_certificates",
"//starboard/content/ssl:copy_ssl_certificates",
]
}

Expand Down
2 changes: 1 addition & 1 deletion starboard/client_porting/eztime/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@ target(gtest_target_type, "eztime_test") {
"//testing/gtest",
]

data_deps = [ "//cobalt/network:copy_ssl_certificates" ]
data_deps = [ "//starboard/content/ssl:copy_ssl_certificates" ]
}
22 changes: 22 additions & 0 deletions starboard/content/ssl/BUILD.gn
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Copyright 2024 The Cobalt Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

import("//starboard/content/ssl/certs.gni")

copy("copy_ssl_certificates") {
install_content = true
sources = network_certs
outputs =
[ "$sb_static_contents_output_data_dir/ssl/certs/{{source_file_part}}" ]
}
Loading

0 comments on commit 13e5773

Please sign in to comment.