From 9c4cb401ad5b523d298590d69a446fdea99434eb Mon Sep 17 00:00:00 2001 From: Niranjan Yardi Date: Wed, 27 Dec 2023 16:45:29 -0800 Subject: [PATCH] =?UTF-8?q?Rename=20libstarboard=5Fplatform=5Fgroup.so=20t?= =?UTF-8?q?o=20libstarboard.so.{sb=5Fversion}=20(=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …#1473) b/298729481 Rename libstarboard_platform_group.so to libstarboard.so.{starboard_version} according to linux package naming standards https://www.debian.org/doc/debian-policy/ch-sharedlibs.html Rename cast library from libcast_starboard_api.so to llibcast_starboard_api.so.{starboard_version} For windows based platforms the library is renamed to libstarboard.{extension} https://learn.microsoft.com/en-us/dotnet/standard/design-guidelines/names-of-assemblies-and-dlls Change-Id: Ide88ea21961487b70803dcab910c5ad8c09d70cc (cherry picked from commit a06e783) --- base/BUILD.gn | 2 +- cobalt/base/BUILD.gn | 2 +- cobalt/browser/BUILD.gn | 2 +- cobalt/debug/BUILD.gn | 2 +- cobalt/h5vcc/BUILD.gn | 2 +- cobalt/input/BUILD.gn | 2 +- cobalt/media/BUILD.gn | 2 +- cobalt/media/sandbox/BUILD.gn | 4 ++-- cobalt/media_capture/BUILD.gn | 2 +- cobalt/media_stream/BUILD.gn | 2 +- cobalt/renderer/BUILD.gn | 2 +- cobalt/speech/BUILD.gn | 2 +- cobalt/subtlecrypto/BUILD.gn | 2 +- cobalt/updater/BUILD.gn | 8 ++++---- cobalt/websocket/BUILD.gn | 2 +- cobalt/xhr/BUILD.gn | 2 +- content/browser/speech/BUILD.gn | 2 +- crypto/BUILD.gn | 2 +- net/BUILD.gn | 2 +- starboard/BUILD.gn | 14 +++++++------- starboard/android/shared/BUILD.gn | 2 +- starboard/benchmark/BUILD.gn | 2 +- starboard/build/config/BUILDCONFIG.gn | 6 +++--- starboard/build/config/starboard_target_type.gni | 5 +++++ starboard/build/install/install_target.gni | 9 ++++++++- starboard/client_porting/cwrappers/BUILD.gn | 2 +- starboard/client_porting/eztime/BUILD.gn | 2 +- starboard/client_porting/poem/BUILD.gn | 2 +- starboard/contrib/cast/README.md | 2 +- .../cast/cast_starboard_api/samples/BUILD.gn | 6 +++--- starboard/elf_loader/BUILD.gn | 10 +++++----- starboard/examples/glclear/BUILD.gn | 2 +- starboard/examples/hello_world/BUILD.gn | 2 +- starboard/examples/window/BUILD.gn | 2 +- starboard/extension/BUILD.gn | 2 +- starboard/loader_app/BUILD.gn | 12 ++++++------ starboard/nplb/BUILD.gn | 2 +- starboard/nplb/compiler_compliance/BUILD.gn | 4 ++-- .../nplb/nplb_evergreen_compat_tests/BUILD.gn | 2 +- starboard/raspi/shared/install_target.gni | 9 ++++++++- starboard/shared/ffmpeg/BUILD.gn | 2 +- .../starboard/player/filter/testing/BUILD.gn | 2 +- starboard/xb1/shared/BUILD.gn | 2 +- third_party/QR-Code-generator/BUILD.gn | 2 +- third_party/chromium/media/BUILD.gn | 2 +- third_party/crashpad/handler/BUILD.gn | 2 +- third_party/crashpad/tools/BUILD.gn | 2 +- third_party/googletest/BUILD.gn | 2 +- 48 files changed, 90 insertions(+), 71 deletions(-) diff --git a/base/BUILD.gn b/base/BUILD.gn index fbfd6b055fa4..3617d5496b3c 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -1562,7 +1562,7 @@ component("base") { deps += [ "//nb", "//starboard/common", - "//starboard", + "//starboard:starboard_group", "//starboard/client_porting/eztime", ] deps -= [ diff --git a/cobalt/base/BUILD.gn b/cobalt/base/BUILD.gn index f2652cc1255d..1f78912fe63b 100644 --- a/cobalt/base/BUILD.gn +++ b/cobalt/base/BUILD.gn @@ -122,7 +122,7 @@ target(gtest_target_type, "base_test") { deps = [ ":base", "//cobalt/test:run_all_unittests", - "//starboard", + "//starboard:starboard_group", "//testing/gmock", "//testing/gtest", ] diff --git a/cobalt/browser/BUILD.gn b/cobalt/browser/BUILD.gn index 9b7b12c99799..04462a554ad1 100644 --- a/cobalt/browser/BUILD.gn +++ b/cobalt/browser/BUILD.gn @@ -200,7 +200,7 @@ static_library("browser") { "//crypto", "//nb", "//net", - "//starboard", + "//starboard:starboard_group", "//starboard/common", "//third_party/icu:icui18n", "//third_party/protobuf:protobuf_lite", diff --git a/cobalt/debug/BUILD.gn b/cobalt/debug/BUILD.gn index 13fdf4283c9d..eb383aa536b1 100644 --- a/cobalt/debug/BUILD.gn +++ b/cobalt/debug/BUILD.gn @@ -77,7 +77,7 @@ static_library("debug") { "//cobalt/web", "//net", "//net:http_server", - "//starboard", + "//starboard:starboard_group", "//third_party/devtools:devtools_frontend_resources", ] } diff --git a/cobalt/h5vcc/BUILD.gn b/cobalt/h5vcc/BUILD.gn index 1de435680168..40fccd414c30 100644 --- a/cobalt/h5vcc/BUILD.gn +++ b/cobalt/h5vcc/BUILD.gn @@ -87,7 +87,7 @@ static_library("h5vcc") { "//cobalt/web:dom_exception", "//cobalt/worker", "//net", - "//starboard", + "//starboard:starboard_group", "//third_party/protobuf:protobuf_lite", ] if (enable_in_app_dial) { diff --git a/cobalt/input/BUILD.gn b/cobalt/input/BUILD.gn index 912eb830276e..978550d2dc8d 100644 --- a/cobalt/input/BUILD.gn +++ b/cobalt/input/BUILD.gn @@ -51,6 +51,6 @@ static_library("input") { "//cobalt/overlay_info", "//cobalt/speech", "//cobalt/system_window", - "//starboard", + "//starboard:starboard_group", ] } diff --git a/cobalt/media/BUILD.gn b/cobalt/media/BUILD.gn index bde4beba217e..99795513a638 100644 --- a/cobalt/media/BUILD.gn +++ b/cobalt/media/BUILD.gn @@ -107,7 +107,7 @@ component("media") { "//cobalt/system_window:system_window", "//nb", "//net", - "//starboard", + "//starboard:starboard_group", "//third_party/chromium/media", "//third_party/protobuf:protobuf_lite", "//url", diff --git a/cobalt/media/sandbox/BUILD.gn b/cobalt/media/sandbox/BUILD.gn index 84d2620bdb9a..5edbfc48e78c 100644 --- a/cobalt/media/sandbox/BUILD.gn +++ b/cobalt/media/sandbox/BUILD.gn @@ -24,7 +24,7 @@ target(final_executable_type, "media_sandbox") { "//cobalt/base", "//cobalt/math", "//cobalt/media", - "//starboard", + "//starboard:starboard_group", "//third_party/chromium/media", ] } @@ -57,7 +57,7 @@ target(final_executable_type, "web_media_player_sandbox") { "//cobalt/storage", "//cobalt/system_window", "//cobalt/trace_event", - "//starboard", + "//starboard:starboard_group", "//third_party/chromium/media", "//url", ] diff --git a/cobalt/media_capture/BUILD.gn b/cobalt/media_capture/BUILD.gn index 9e7ffc9daae7..df692af1283a 100644 --- a/cobalt/media_capture/BUILD.gn +++ b/cobalt/media_capture/BUILD.gn @@ -49,7 +49,7 @@ static_library("media_capture") { "//cobalt/script:engine", "//cobalt/speech", "//cobalt/web:dom_exception", - "//starboard", + "//starboard:starboard_group", ] } diff --git a/cobalt/media_stream/BUILD.gn b/cobalt/media_stream/BUILD.gn index b10e1fcb13f4..058ee0680da6 100644 --- a/cobalt/media_stream/BUILD.gn +++ b/cobalt/media_stream/BUILD.gn @@ -47,7 +47,7 @@ static_library("media_stream") { "//cobalt/media", "//cobalt/script", "//cobalt/speech", - "//starboard", + "//starboard:starboard_group", ] } diff --git a/cobalt/renderer/BUILD.gn b/cobalt/renderer/BUILD.gn index 54d218741fce..41633ef201bc 100644 --- a/cobalt/renderer/BUILD.gn +++ b/cobalt/renderer/BUILD.gn @@ -25,7 +25,7 @@ source_set("renderer_headers_only") { "//base", "//cobalt/render_tree", "//cobalt/render_tree:animations", - "//starboard", + "//starboard:starboard_group", ] } diff --git a/cobalt/speech/BUILD.gn b/cobalt/speech/BUILD.gn index 3f4cc726aa46..1e20f72a3c81 100644 --- a/cobalt/speech/BUILD.gn +++ b/cobalt/speech/BUILD.gn @@ -105,7 +105,7 @@ static_library("speech") { "//cobalt/script", "//cobalt/web:dom_exception", "//content/browser/speech", - "//starboard", + "//starboard:starboard_group", "//third_party/flac", "//third_party/protobuf:protobuf_lite", "//url", diff --git a/cobalt/subtlecrypto/BUILD.gn b/cobalt/subtlecrypto/BUILD.gn index a3698eae23b9..ebaa1d83bc7b 100644 --- a/cobalt/subtlecrypto/BUILD.gn +++ b/cobalt/subtlecrypto/BUILD.gn @@ -22,7 +22,7 @@ static_library("crypto_impl") { deps = [ "//base", - "//starboard", + "//starboard:starboard_group", "//third_party/boringssl:crypto", ] } diff --git a/cobalt/updater/BUILD.gn b/cobalt/updater/BUILD.gn index 94e7ae64ccee..ad9387bfcaca 100644 --- a/cobalt/updater/BUILD.gn +++ b/cobalt/updater/BUILD.gn @@ -72,18 +72,18 @@ target(final_executable_type, "updater_sandbox") { "//components/crx_file", "//components/prefs", "//components/update_client", - "//starboard", + "//starboard:starboard_group", ] } target(final_executable_type, "crash_sandbox") { sources = [ "crash_sandbox.cc" ] - deps = [ "//starboard" ] + deps = [ "//starboard:starboard_group" ] } target(final_executable_type, "noop_sandbox") { sources = [ "noop_sandbox.cc" ] - deps = [ "//starboard" ] + deps = [ "//starboard:starboard_group" ] } target(final_executable_type, "one_app_only_sandbox") { @@ -93,7 +93,7 @@ target(final_executable_type, "one_app_only_sandbox") { "//cobalt/browser", "//cobalt/browser:browser_switches", "//net", - "//starboard", + "//starboard:starboard_group", "//starboard/loader_app:app_key", ] } diff --git a/cobalt/websocket/BUILD.gn b/cobalt/websocket/BUILD.gn index 77469ab0e052..dc0608ebbd35 100644 --- a/cobalt/websocket/BUILD.gn +++ b/cobalt/websocket/BUILD.gn @@ -35,7 +35,7 @@ static_library("websocket") { "//cobalt/script", "//cobalt/web:dom_exception", "//net", - "//starboard", + "//starboard:starboard_group", "//third_party/protobuf:protobuf_lite", "//url", ] diff --git a/cobalt/xhr/BUILD.gn b/cobalt/xhr/BUILD.gn index c2bd6fcb5fca..beb1af312625 100644 --- a/cobalt/xhr/BUILD.gn +++ b/cobalt/xhr/BUILD.gn @@ -46,7 +46,7 @@ static_library("xhr") { "//cobalt/web", "//nb", "//net", - "//starboard", + "//starboard:starboard_group", "//third_party/protobuf:protobuf_lite", "//url", ] diff --git a/content/browser/speech/BUILD.gn b/content/browser/speech/BUILD.gn index 21ba4c7669b3..93b4a68c6b56 100644 --- a/content/browser/speech/BUILD.gn +++ b/content/browser/speech/BUILD.gn @@ -42,7 +42,7 @@ target(gtest_target_type, "speech_test") { "//cobalt//browser:test_dependencies_on_browser", "//cobalt/media", "//cobalt/test:run_all_unittests", - "//starboard", + "//starboard:starboard_group", "//testing/gtest", ] } diff --git a/crypto/BUILD.gn b/crypto/BUILD.gn index e1292c430d1d..74af55a5770b 100644 --- a/crypto/BUILD.gn +++ b/crypto/BUILD.gn @@ -229,7 +229,7 @@ config("platform_config") { # on the current SSL library should just depend on this. group("platform") { if (is_starboard) { - deps = [ "//starboard" ] + deps = [ "//starboard:starboard_group", ] public_deps = [ "//third_party/boringssl:crypto" ] } else { public_deps = [ "//third_party/boringssl" ] diff --git a/net/BUILD.gn b/net/BUILD.gn index 2fb59e756818..e978e3059b33 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn @@ -1726,7 +1726,7 @@ component("net") { "//base/third_party/dynamic_annotations", "//crypto", "//nb", - "//starboard", + "//starboard:starboard_group", "//third_party/boringssl:crypto", "//third_party/brotli:dec", "//third_party/icu:icui18n", diff --git a/starboard/BUILD.gn b/starboard/BUILD.gn index aab526b978eb..639c21865fce 100644 --- a/starboard/BUILD.gn +++ b/starboard/BUILD.gn @@ -84,12 +84,12 @@ group("gn_all") { group("default") { deps = [ - ":starboard", + ":starboard_group", "//starboard/tools:build_app_launcher_zip", ] } -group("starboard") { +group("starboard_group") { public_deps = [ ":starboard_headers_only", "//starboard/client_porting/cwrappers", @@ -106,7 +106,7 @@ group("starboard") { if (sb_is_evergreen) { public_deps += [ "//starboard/elf_loader:sabi_string" ] } else { - data_deps = [ ":starboard_platform_group($starboard_toolchain)" ] + data_deps = [ ":starboard($starboard_toolchain)" ] } # TODO: b/295702296 Fix libunwind for modular builds. @@ -115,7 +115,7 @@ group("starboard") { } } else { public_deps += [ - ":starboard_platform_group_static($starboard_toolchain)", + ":starboard_static($starboard_toolchain)", "//starboard/common", ] @@ -187,10 +187,10 @@ source_set("starboard_headers_only") { if (current_toolchain == starboard_toolchain) { # This is the default 'starboard_platform_target'; use default properties - starboard_platform_target("starboard_platform_group") { + starboard_platform_target("starboard") { } - starboard_platform_target("starboard_platform_group_static") { + starboard_platform_target("starboard_static") { target_type = "group" } @@ -211,7 +211,7 @@ if (current_toolchain == starboard_toolchain) { } group("starboard_with_main") { - public_deps = [ ":starboard" ] + public_deps = [ ":starboard_group" ] if (sb_is_modular && !sb_is_evergreen) { public_deps += [ "//$starboard_path:starboard_platform_with_main" ] } diff --git a/starboard/android/shared/BUILD.gn b/starboard/android/shared/BUILD.gn index b076845cde7a..9797fbf96c3c 100644 --- a/starboard/android/shared/BUILD.gn +++ b/starboard/android/shared/BUILD.gn @@ -489,7 +489,7 @@ target(gtest_target_type, "starboard_platform_tests") { configs += [ "//starboard/build/config:starboard_implementation" ] deps = [ - "//starboard", + "//starboard:starboard_group", "//starboard/shared/starboard/player/filter/testing:test_util", "//testing/gmock", "//testing/gtest", diff --git a/starboard/benchmark/BUILD.gn b/starboard/benchmark/BUILD.gn index 7fd121535756..4cba863b54e4 100644 --- a/starboard/benchmark/BUILD.gn +++ b/starboard/benchmark/BUILD.gn @@ -22,7 +22,7 @@ target(final_executable_type, "benchmark") { ] public_deps = [ - "//starboard", + "//starboard:starboard_group", "//third_party/google_benchmark", ] deps = cobalt_platform_dependencies diff --git a/starboard/build/config/BUILDCONFIG.gn b/starboard/build/config/BUILDCONFIG.gn index 6b9e73370d4f..64526e159eae 100644 --- a/starboard/build/config/BUILDCONFIG.gn +++ b/starboard/build/config/BUILDCONFIG.gn @@ -367,7 +367,7 @@ template("evergreen_loader") { deps = [ ":copy_loader_app_lib${original_target_name}", "//cobalt/content/fonts:copy_font_data", - "//starboard", + "//starboard:starboard_group", "//starboard/elf_loader:constants", "//starboard/elf_loader:elf_loader", "//starboard/elf_loader:evergreen_info", @@ -531,10 +531,10 @@ template("shared_library") { deps = [ ":$original_target_name($cobalt_toolchain)", - "//starboard:starboard_platform_group($starboard_toolchain)", + "//starboard($starboard_toolchain)", ] if (!separate_install_targets_for_bundling) { - deps += [ "//starboard:starboard_platform_group_install($starboard_toolchain)" ] + deps += [ "//starboard:starboard_install($starboard_toolchain)" ] } } if (!is_host_win) { diff --git a/starboard/build/config/starboard_target_type.gni b/starboard/build/config/starboard_target_type.gni index c3c5916e46f8..5551828a4a71 100644 --- a/starboard/build/config/starboard_target_type.gni +++ b/starboard/build/config/starboard_target_type.gni @@ -12,8 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//starboard/build/config/os_definitions.gni") declare_args() { starboard_target_type = "" + starboard_shared_library_extension = "so.${sb_api_version}" } if (starboard_target_type == "") { @@ -37,6 +39,9 @@ template("starboard_platform_target") { } if (target_type == "shared_library") { build_loader = false + if (!is_host_win) { + output_extension = starboard_shared_library_extension + } } public_deps = [ "//starboard/client_porting/cwrappers", diff --git a/starboard/build/install/install_target.gni b/starboard/build/install/install_target.gni index 62f83e0197db..b11168cb6509 100644 --- a/starboard/build/install/install_target.gni +++ b/starboard/build/install/install_target.gni @@ -13,6 +13,7 @@ # limitations under the License. import("//starboard/build/config/install.gni") +import("//starboard/build/config/starboard_target_type.gni") template("install_target") { installable_target_name = invoker.installable_target_name @@ -23,7 +24,13 @@ template("install_target") { source_name = installable_target_name } else if (invoker.type == "shared_library") { install_subdir = "lib" - source_name = "lib${installable_target_name}.so" + if (installable_target_name == "starboard" || + installable_target_name == "cast_starboard_api") { + source_name = + "lib${installable_target_name}.${starboard_shared_library_extension}" + } else { + source_name = "lib${installable_target_name}.so" + } } else { assert(false, "You can only install an executable or shared library.") } diff --git a/starboard/client_porting/cwrappers/BUILD.gn b/starboard/client_porting/cwrappers/BUILD.gn index b73f43b0b2ce..71d1d5709e5e 100644 --- a/starboard/client_porting/cwrappers/BUILD.gn +++ b/starboard/client_porting/cwrappers/BUILD.gn @@ -25,7 +25,7 @@ target(gtest_target_type, "cwrappers_test") { ] public_deps = [ ":cwrappers", - "//starboard", + "//starboard:starboard_group", "//testing/gmock", "//testing/gtest", ] diff --git a/starboard/client_porting/eztime/BUILD.gn b/starboard/client_porting/eztime/BUILD.gn index 8f19135eb13b..061c62d3dc70 100644 --- a/starboard/client_porting/eztime/BUILD.gn +++ b/starboard/client_porting/eztime/BUILD.gn @@ -37,7 +37,7 @@ target(gtest_target_type, "eztime_test") { deps = [ ":eztime", - "//starboard", + "//starboard:starboard_group", "//testing/gmock", "//testing/gtest", ] diff --git a/starboard/client_porting/poem/BUILD.gn b/starboard/client_porting/poem/BUILD.gn index eb23fefaef5c..80512c2502d6 100644 --- a/starboard/client_porting/poem/BUILD.gn +++ b/starboard/client_porting/poem/BUILD.gn @@ -22,7 +22,7 @@ target(gtest_target_type, "poem_unittests") { ] deps = [ - "//starboard", + "//starboard:starboard_group", "//testing/gtest", ] } diff --git a/starboard/contrib/cast/README.md b/starboard/contrib/cast/README.md index 479ab3cd254d..abfae7dded72 100644 --- a/starboard/contrib/cast/README.md +++ b/starboard/contrib/cast/README.md @@ -6,7 +6,7 @@ Starboard required to run Cast. ### Customizations As of Starboard 15, there are public methods required for Cast that are not -already exposed by `libstarboard_platform_group.so`. As a result, the dedicated +already exposed by `libstarboard.so`. As a result, the dedicated header `cast_starboard_api.h` is omitted from this release, though it may return in the future. diff --git a/starboard/contrib/cast/cast_starboard_api/samples/BUILD.gn b/starboard/contrib/cast/cast_starboard_api/samples/BUILD.gn index a26bfa47c537..bebd13a130e9 100644 --- a/starboard/contrib/cast/cast_starboard_api/samples/BUILD.gn +++ b/starboard/contrib/cast/cast_starboard_api/samples/BUILD.gn @@ -1,5 +1,4 @@ # Copyright 2023 The Cobalt Authors. All rights reserved. -import("//starboard/build/config/starboard_target_type.gni") import("//starboard/contrib/cast/cast.gni") assert(build_with_separate_cobalt_toolchain && use_contrib_cast) @@ -25,13 +24,14 @@ config("default") { } if (current_toolchain == starboard_toolchain) { + import("//starboard/build/config/starboard_target_type.gni") starboard_platform_target("cast_starboard_api") { extra_configs = [ ":default" ] } copy("cast_starboard_api_test_data") { install_content = true - sources = [ "$root_out_dir/libcast_starboard_api.so" ] + sources = [ "$root_out_dir/libcast_starboard_api.${starboard_shared_library_extension}" ] # This artifact is consumed by a test built outside of the # starboard_toolchain; move from `starboard/content/` to `content/`. @@ -50,7 +50,7 @@ target(gtest_target_type, "cast_starboard_api_test") { ] data_deps = [ ":cast_starboard_api_test_data($starboard_toolchain)" ] deps = [ - "//starboard", + "//starboard:starboard_group", "//starboard/nplb/testdata/file_tests:nplb_file_tests_data", "//testing/gtest", ] diff --git a/starboard/elf_loader/BUILD.gn b/starboard/elf_loader/BUILD.gn index 9b1354f6e964..b5bce40b92e9 100644 --- a/starboard/elf_loader/BUILD.gn +++ b/starboard/elf_loader/BUILD.gn @@ -56,7 +56,7 @@ static_library("elf_loader") { ":constants", ":evergreen_config", ":evergreen_info", - "//starboard", + "//starboard:starboard_group", "//starboard/common", "//third_party/lz4_lib:lz4", ] @@ -78,7 +78,7 @@ if (sb_is_evergreen_compatible) { ":constants", ":evergreen_config", ":evergreen_info", - "//starboard", + "//starboard:starboard_group", "//starboard/common", ] @@ -112,7 +112,7 @@ if (current_toolchain == starboard_toolchain && !is_host_win) { ":evergreen_info", ":sabi_string", "//cobalt/content/fonts:copy_font_data", - "//starboard", + "//starboard:starboard_group", ] if (!sb_is_evergreen_compatible) { @@ -149,7 +149,7 @@ if (sb_is_evergreen_compatible) { ":elf_loader_sys", ":evergreen_info", ":sabi_string", - "//starboard", + "//starboard:starboard_group", ] if (!sb_is_evergreen_compatible) { @@ -164,7 +164,7 @@ if (!is_host_win) { testonly = true sources = [ "//starboard/common/test_main.cc" ] deps = [ - "//starboard", + "//starboard:starboard_group", "//testing/gmock", "//testing/gtest", ] diff --git a/starboard/examples/glclear/BUILD.gn b/starboard/examples/glclear/BUILD.gn index 60c6d62a0656..7a7e49a0f537 100644 --- a/starboard/examples/glclear/BUILD.gn +++ b/starboard/examples/glclear/BUILD.gn @@ -14,5 +14,5 @@ target(final_executable_type, "starboard_glclear_example") { sources = [ "main.cc" ] - deps = [ "//starboard" ] + deps = [ "//starboard:starboard_group" ] } diff --git a/starboard/examples/hello_world/BUILD.gn b/starboard/examples/hello_world/BUILD.gn index 36642f6c1f6a..d6560ce9b8a2 100644 --- a/starboard/examples/hello_world/BUILD.gn +++ b/starboard/examples/hello_world/BUILD.gn @@ -13,6 +13,6 @@ # limitations under the License. target(final_executable_type, "starboard_hello_world_example") { - deps = [ "//starboard" ] + deps = [ "//starboard:starboard_group" ] sources = [ "main.cc" ] } diff --git a/starboard/examples/window/BUILD.gn b/starboard/examples/window/BUILD.gn index 93c3aae5524a..1d31d6a07cad 100644 --- a/starboard/examples/window/BUILD.gn +++ b/starboard/examples/window/BUILD.gn @@ -16,6 +16,6 @@ target(final_executable_type, "starboard_window_example") { testonly = true sources = [ "main.cc" ] - public_deps = [ "//starboard" ] + public_deps = [ "//starboard:starboard_group" ] data_deps = [ "//third_party/icu:icudata" ] } diff --git a/starboard/extension/BUILD.gn b/starboard/extension/BUILD.gn index 57b95b18ddf3..47197ab63733 100644 --- a/starboard/extension/BUILD.gn +++ b/starboard/extension/BUILD.gn @@ -22,7 +22,7 @@ target(gtest_target_type, "extension_test") { deps = [ "//cobalt/base", "//cobalt/test:run_all_unittests", - "//starboard", + "//starboard:starboard_group", "//testing/gmock", "//testing/gtest", ] diff --git a/starboard/loader_app/BUILD.gn b/starboard/loader_app/BUILD.gn index 415d51572a56..da5eaee6649e 100644 --- a/starboard/loader_app/BUILD.gn +++ b/starboard/loader_app/BUILD.gn @@ -29,7 +29,7 @@ group("common_loader_app_dependencies") { ":memory_tracker_thread", ":reset_evergreen_update", ":slot_management", - "//starboard", + "//starboard:starboard_group", "//starboard/elf_loader:constants", "//starboard/elf_loader:evergreen_info", "//starboard/elf_loader:sabi_string", @@ -146,7 +146,7 @@ static_library("app_key_files") { "app_key_files.cc", "app_key_files.h", ] - deps = [ "//starboard" ] + deps = [ "//starboard:starboard_group" ] } target(gtest_target_type, "app_key_files_test") { @@ -170,7 +170,7 @@ static_library("app_key") { "app_key_internal.h", ] deps = [ - "//starboard", + "//starboard:starboard_group", "//third_party/modp_b64", ] } @@ -233,7 +233,7 @@ static_library("installation_manager") { deps = [ ":installation_store_proto", ":pending_restart", - "//starboard", + "//starboard:starboard_group", ] } @@ -265,7 +265,7 @@ static_library("slot_management") { ":app_key_files", ":drain_file", ":installation_manager", - "//starboard", + "//starboard:starboard_group", "//starboard/elf_loader", "//starboard/elf_loader:constants", "//starboard/elf_loader:sabi_string", @@ -325,7 +325,7 @@ static_library("reset_evergreen_update") { "reset_evergreen_update.cc", "reset_evergreen_update.h", ] - deps = [ "//starboard" ] + deps = [ "//starboard:starboard_group" ] } # TODO: b/309493306 - Stop building evergreen targets for all non-evergreen platforms. diff --git a/starboard/nplb/BUILD.gn b/starboard/nplb/BUILD.gn index 3f314cf427d5..f0ec864229a4 100644 --- a/starboard/nplb/BUILD.gn +++ b/starboard/nplb/BUILD.gn @@ -240,7 +240,7 @@ target(gtest_target_type, "nplb") { configs -= [ "//build/config/compiler:no_exceptions" ] deps = [ - "//starboard", + "//starboard:starboard_group", "//starboard/common", "//starboard/nplb/compiler_compliance:cpp14_supported", "//starboard/shared/starboard/media:media_util", diff --git a/starboard/nplb/compiler_compliance/BUILD.gn b/starboard/nplb/compiler_compliance/BUILD.gn index 58f1dd1dff07..e3638c1436b9 100644 --- a/starboard/nplb/compiler_compliance/BUILD.gn +++ b/starboard/nplb/compiler_compliance/BUILD.gn @@ -18,7 +18,7 @@ static_library("cpp14_supported") { "cpp14_initialization.cc", ] cflags_cc = [ "-std=c++14" ] - deps = [ "//starboard" ] + deps = [ "//starboard:starboard_group" ] } if (sb_enable_cpp17_audit) { @@ -26,7 +26,7 @@ if (sb_enable_cpp17_audit) { sources = [ "cpp17_support.cc" ] deps = [ ":cpp17_supported_config_shim", - "//starboard", + "//starboard:starboard_group", ] } diff --git a/starboard/nplb/nplb_evergreen_compat_tests/BUILD.gn b/starboard/nplb/nplb_evergreen_compat_tests/BUILD.gn index 6978098f146b..c3d159047db8 100644 --- a/starboard/nplb/nplb_evergreen_compat_tests/BUILD.gn +++ b/starboard/nplb/nplb_evergreen_compat_tests/BUILD.gn @@ -27,7 +27,7 @@ target(gtest_target_type, "nplb_evergreen_compat_tests") { ] public_deps = [ - "//starboard", + "//starboard:starboard_group", "//testing/gmock", "//testing/gtest", ] diff --git a/starboard/raspi/shared/install_target.gni b/starboard/raspi/shared/install_target.gni index 741384015ba6..dfc1b42c937f 100644 --- a/starboard/raspi/shared/install_target.gni +++ b/starboard/raspi/shared/install_target.gni @@ -12,7 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//starboard/build/config/starboard_target_type.gni") import("//starboard/raspi/shared/toolchain/raspi_shared_toolchain.gni") + template("install_target") { installable_target_name = invoker.installable_target_name @@ -25,7 +27,12 @@ template("install_target") { source_name = installable_target_name } else if (invoker.type == "shared_library") { install_subdir = "lib" - source_name = "lib${installable_target_name}.so" + if (installable_target_name == "starboard") { + source_name = + "lib${installable_target_name}.${starboard_shared_library_extension}" + } else { + source_name = "lib${installable_target_name}.so" + } } else { assert(false, "You can only install an executable or shared library.") } diff --git a/starboard/shared/ffmpeg/BUILD.gn b/starboard/shared/ffmpeg/BUILD.gn index 5ad46938f1a9..ed5b5e4c744e 100644 --- a/starboard/shared/ffmpeg/BUILD.gn +++ b/starboard/shared/ffmpeg/BUILD.gn @@ -116,7 +116,7 @@ target(gtest_target_type, "ffmpeg_demuxer_test") { deps = [ ":ffmpeg_dispatch_sources", "//cobalt/test:run_all_unittests", - "//starboard", + "//starboard:starboard_group", "//starboard/common", "//testing/gmock", "//testing/gtest", diff --git a/starboard/shared/starboard/player/filter/testing/BUILD.gn b/starboard/shared/starboard/player/filter/testing/BUILD.gn index d1cb5bedc103..ad2dd0e66dac 100644 --- a/starboard/shared/starboard/player/filter/testing/BUILD.gn +++ b/starboard/shared/starboard/player/filter/testing/BUILD.gn @@ -79,7 +79,7 @@ if (current_toolchain == starboard_toolchain) { public_configs = [ "//starboard/build/config:starboard_implementation" ] public_deps = [ - "//starboard", + "//starboard:starboard_group", "//starboard/shared/starboard/media:media_util", "//starboard/shared/starboard/player:player_download_test_data", "//starboard/shared/starboard/player:video_dmp", diff --git a/starboard/xb1/shared/BUILD.gn b/starboard/xb1/shared/BUILD.gn index 9fd99b999568..a3a3538a779b 100644 --- a/starboard/xb1/shared/BUILD.gn +++ b/starboard/xb1/shared/BUILD.gn @@ -23,7 +23,7 @@ target(gtest_target_type, "starboard_platform_tests") { configs += [ "//starboard/build/config:starboard_implementation" ] deps = [ - "//starboard", + "//starboard:starboard_group", "//testing/gmock", "//testing/gtest", ] diff --git a/third_party/QR-Code-generator/BUILD.gn b/third_party/QR-Code-generator/BUILD.gn index 53153fd38565..260aed52e71d 100644 --- a/third_party/QR-Code-generator/BUILD.gn +++ b/third_party/QR-Code-generator/BUILD.gn @@ -22,5 +22,5 @@ static_library("qr_code_generator") { "cpp/QrSegment.hpp", ] include_dirs = [ "." ] - deps = [ "//starboard" ] + deps = [ "//starboard:starboard_group", ] } diff --git a/third_party/chromium/media/BUILD.gn b/third_party/chromium/media/BUILD.gn index e9141248b595..4ed113c83fd5 100644 --- a/third_party/chromium/media/BUILD.gn +++ b/third_party/chromium/media/BUILD.gn @@ -247,7 +247,7 @@ component("media") { "//build:chromecast_buildflags", "//build:chromeos_buildflags", "//net", - "//starboard", + "//starboard:starboard_group", "//url", ] } diff --git a/third_party/crashpad/handler/BUILD.gn b/third_party/crashpad/handler/BUILD.gn index 2b9d2e4c12e1..c1f3204a8af8 100644 --- a/third_party/crashpad/handler/BUILD.gn +++ b/third_party/crashpad/handler/BUILD.gn @@ -105,7 +105,7 @@ static_library("handler") { } if (crashpad_is_in_starboard) { - public_deps += [ "//starboard" ] + public_deps += [ "//starboard:starboard_group", ] } } diff --git a/third_party/crashpad/tools/BUILD.gn b/third_party/crashpad/tools/BUILD.gn index 76d6d286decb..ef255133af4f 100644 --- a/third_party/crashpad/tools/BUILD.gn +++ b/third_party/crashpad/tools/BUILD.gn @@ -48,7 +48,7 @@ if (!crashpad_is_ios) { if (crashpad_is_in_starboard) { deps += [ - "//starboard", + "//starboard:starboard_group", ] } diff --git a/third_party/googletest/BUILD.gn b/third_party/googletest/BUILD.gn index 143b0253e30f..a20c56e6ea07 100644 --- a/third_party/googletest/BUILD.gn +++ b/third_party/googletest/BUILD.gn @@ -156,7 +156,7 @@ source_set("gtest") { # line, so it happens to work in this case. all_dependent_configs = [ "//build/config/compiler:rtti" ] - public_deps = [ "//starboard" ] + public_deps = [ "//starboard:starboard_group", ] } # Do NOT depend on this directly. Use //testing/gtest:gtest_main instead.