Fix up GN dependencies

base/BUILD.gn

@@ -1112,7 +1112,10 @@ component("base") {
   }
 
   if (is_starboard && current_toolchain != host_toolchain) {
-    deps += [ "//starboard:starboard_group" ]
+    deps += [
+      "//starboard/common",
+      "//starboard:starboard_group"
+    ]
   }
 
   # `raw_ptr` cannot be made a component due to CRT symbol issues.
@@ -2702,7 +2705,10 @@ static_library("base_static") {
   deps = [ "//build:chromeos_buildflags" ]
 
   if (is_starboard && current_toolchain != host_toolchain) {
-    deps += [ "//starboard:starboard_group" ]
+    deps += [
+      "//starboard/common",
+      "//starboard:starboard_group"
+      ]
   }
 
   if (is_win) {

cobalt/debug/BUILD.gn

@@ -80,6 +80,7 @@ static_library("debug") {
     "//net",
     "//net/server:http_server",
     "//starboard:starboard_group",
+    "//starboard/common",
     "//third_party/devtools:devtools_frontend_resources",
   ]
 

cobalt/h5vcc/BUILD.gn

@@ -84,6 +84,7 @@ static_library("h5vcc") {
     "//cobalt/worker",
     "//net",
     "//starboard:starboard_group",
+    "//starboard/common",
     "//third_party/protobuf:protobuf_lite",
   ]
   if (enable_in_app_dial) {

cobalt/media/BUILD.gn

@@ -111,6 +111,7 @@ component("media") {
     "//media",
     "//net",
     "//starboard:starboard_group",
+    "//starboard/common",
     "//third_party/protobuf:protobuf_lite",
     "//ui/gfx:gfx",
     "//url",

cobalt/media/sandbox/BUILD.gn

@@ -60,6 +60,7 @@ target(final_executable_type, "web_media_player_sandbox") {
     "//cobalt/trace_event",
     "//media",
     "//starboard:starboard_group",
+    "//starboard/common",
     "//ui/gfx:gfx",
     "//url",
   ]

media/BUILD.gn

@@ -243,6 +243,7 @@ component("media") {
     "//build:chromecast_buildflags",
     "//build:chromeos_buildflags",
     "//net",
+    "//starboard/common",
     "//starboard:starboard_group",
     "//third_party/abseil-cpp/absl/types:optional",
     "//ui/gfx:gfx",

starboard/client_porting/eztime/BUILD.gn

@@ -38,6 +38,7 @@ target(gtest_target_type, "eztime_test") {
   deps = [
     ":eztime",
     "//starboard:starboard_group",
+    "//starboard/common",
     "//testing/gmock",
     "//testing/gtest",
   ]

starboard/examples/glclear/BUILD.gn

@@ -14,5 +14,8 @@
 
 target(final_executable_type, "starboard_glclear_example") {
   sources = [ "main.cc" ]
-  deps = [ "//starboard:starboard_group" ]
+  deps = [
+    "//starboard:starboard_group",
+    "//starboard/common",
+  ]
 }

starboard/examples/window/BUILD.gn

@@ -16,5 +16,8 @@ target(final_executable_type, "starboard_window_example") {
   testonly = true
 
   sources = [ "main.cc" ]
-  public_deps = [ "//starboard:starboard_group" ]
+  public_deps = [
+    "//starboard:starboard_group",
+    "//starboard/common",
+  ]
 }

starboard/loader_app/BUILD.gn

@@ -154,7 +154,10 @@ static_library("app_key_files") {
     "app_key_files.cc",
     "app_key_files.h",
   ]
-  deps = [ "//starboard:starboard_group" ]
+  deps = [
+    "//starboard:starboard_group",
+    "//starboard/common",
+  ]
 }
 
 if (sb_is_evergreen) {
@@ -181,6 +184,7 @@ static_library("app_key") {
   ]
   deps = [
     "//starboard:starboard_group",
+    "//starboard/common",
     "//third_party/modp_b64",
   ]
 }
@@ -231,6 +235,7 @@ if (sb_is_evergreen) {
     deps = [
       ":drain_file",
       ":drain_file_helper",
+      "//starboard/common",
       "//testing/gmock",
       "//testing/gtest",
     ]
@@ -258,6 +263,7 @@ static_library("installation_manager") {
     ":pending_restart",
     ":record_loader_app_status",
     "//starboard:starboard_group",
+    "//starboard/common",
   ]
 }
 
@@ -292,6 +298,7 @@ static_library("slot_management") {
     ":drain_file",
     ":installation_manager",
     "//starboard:starboard_group",
+    "//starboard/common",
     "//starboard/elf_loader",
     "//starboard/elf_loader:constants",
     "//starboard/elf_loader:sabi_string",
@@ -322,6 +329,7 @@ if (sb_is_evergreen) {
       ":installation_store_proto",
       ":slot_management",
       "//starboard:starboard_with_main",
+      "//starboard/common",
       "//starboard/elf_loader:sabi_string",
       "//testing/gmock",
       "//testing/gtest",

third_party/QR-Code-generator/BUILD.gn

@@ -22,5 +22,8 @@ static_library("qr_code_generator") {
     "cpp/QrSegment.hpp",
   ]
   include_dirs = [ "." ]
-  deps = [ "//starboard:starboard_group", ]
+  deps = [
+    "//starboard/common",
+    "//starboard:starboard_group",
+  ]
 }

third_party/abseil-cpp/absl/time/internal/cctz/BUILD.gn

@@ -53,6 +53,9 @@ absl_source_set("time_zone") {
     ]
   }
   if (is_starboard) {
-    deps += [ "//starboard:starboard_group" ]
+    deps += [
+      "//starboard/common",
+      "//starboard:starboard_group"
+    ]
   }
 }

third_party/googletest/BUILD.gn

@@ -125,7 +125,9 @@ source_set("gtest") {
   configs += [ "//build/config/compiler:no_chromium_code" ]
 
   defines = []
-  deps = []
+  deps = [
+    "//starboard/common",
+  ]
   public_deps = []
   if (is_nacl || !build_with_chromium) {
     defines += [ "GTEST_DISABLE_PRINT_STACK_TRACE" ]
@@ -197,7 +199,10 @@ source_set("gmock") {
     "src/googlemock/src/gmock.cc",
   ]
 
-  public_deps = [ ":gtest" ]
+  public_deps = [
+    ":gtest",
+    "//starboard/common",
+  ]
 
   public_configs = [ ":gmock_config" ]
 }

third_party/icu/BUILD.gn

@@ -344,7 +344,7 @@ template("generate_icuuc") {
     if (is_starboard) {
       public_deps = [
         "//starboard:starboard_headers_only",
-        "//starboard/common:common",
+        "//starboard/common",
       ]
       defines += [
         "U_HAVE_NL_LANGINFO_CODESET=0",