Cherry pick PR #1952: Revert "Revert "Rename libstarboard_platform_gr…

…oup.so to libstarboard.so.{sb_version}"" (#2161) Refer to the original PR: #1952 b/298729481 Reverts #1948 Co-authored-by: Niranjan Yardi <[email protected]>
youtube · Jan 5, 2024 · bd046c5 · bd046c5
1 parent d416477
commit bd046c5
Show file tree

Hide file tree

Showing 49 changed files with 92 additions and 73 deletions.
diff --git 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
@@ -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
@@ -201,7 +201,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/nb/BUILD.gn b/nb/BUILD.gn
@@ -93,7 +93,7 @@ target(gtest_target_type, "nb_test") {
 
     deps = [
       ":nb",
-      "//starboard",
+      "//starboard:starboard_group",
       "//testing/gmock:gmock",
       "//testing/gtest",
     ]
@@ -106,7 +106,7 @@ target(gtest_target_type, "reuse_allocator_benchmark") {
   deps = [
     ":nb",
     ":nb_copy_test_data",
-    "//starboard",
+    "//starboard:starboard_group",
   ]
 }
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.