Set sb_is_modular, sb_is_evergreen appropriately

Change-Id: I1c433ccfca0304488dbec0b85223aa22c148c696

build/toolchain/gcc_toolchain.gni

@@ -117,7 +117,7 @@ if (enable_resource_allowlist_generation) {
 template("gcc_toolchain") {
   toolchain(target_name) {
     is_starboard_toolchain = target_name == "starboard"
-    if (!build_with_separate_cobalt_toolchain) {
+    if (!sb_is_modular || sb_is_evergreen) {
       not_needed(["is_starboard_toolchain"])
     }
     assert(defined(invoker.ar), "gcc_toolchain() must specify a \"ar\" value")

cobalt/BUILD.gn

@@ -81,8 +81,5 @@ group("default") {
         "//components/update_client",
       ]
     }
-    if (!build_with_separate_cobalt_toolchain) {
-      deps += [ "//third_party/llvm-project/libunwind:unwind_evergreen" ]
-    }
   }
 }

components/update_client/BUILD.gn

@@ -246,10 +246,6 @@ target(gtest_target_type, "cobalt_slot_management_test") {
     "//starboard/loader_app:installation_manager",
     "//testing/gmock",
     "//testing/gtest",
+    "//starboard/loader_app"
   ]
-  if (build_with_separate_cobalt_toolchain) {
-    data_deps = [ "//starboard/loader_app($starboard_toolchain)" ]
-  } else {
-    deps += [ "//starboard/loader_app" ]
-  }
 }

starboard/BUILD.gn

@@ -57,11 +57,6 @@ group("gn_all") {
     deps += [ "//starboard/benchmark" ]
   }
 
-  if (build_with_separate_cobalt_toolchain && is_cobalt_toolchain) {
-    assert(sb_is_modular,
-           "sb_is_modular should be set when building with cobalt_toolchain")
-  }
-
   if (!sb_is_evergreen) {
     deps += [ "//third_party/lz4_lib:lz4" ]
 
@@ -99,7 +94,7 @@ group("starboard") {
     if (sb_is_evergreen) {
       public_deps += [ "//starboard/elf_loader:sabi_string" ]
     }
-    if (build_with_separate_cobalt_toolchain) {
+    if (sb_is_modular && !sb_is_evergreen) {
       data_deps = [ ":starboard_platform_group($starboard_toolchain)" ]
     } else {
       public_deps += [ "//third_party/llvm-project/libunwind:unwind_evergreen" ]
@@ -110,7 +105,7 @@ group("starboard") {
       "//starboard/common",
     ]
 
-    if (!build_with_separate_cobalt_toolchain) {
+    if (!sb_is_modular || sb_is_evergreen) {
       if (sb_is_evergreen_compatible) {
         public_deps += [ "//third_party/crashpad/wrapper" ]
       } else {
@@ -215,7 +210,7 @@ if (current_toolchain == starboard_toolchain) {
 
   group("starboard_with_main") {
     public_deps = [ ":starboard" ]
-    if (build_with_separate_cobalt_toolchain) {
+    if (sb_is_modular && !sb_is_evergreen) {
       public_deps += [ "//$starboard_path:starboard_platform_with_main" ]
     }
   }

starboard/build/config/BUILD.gn

@@ -92,7 +92,7 @@ config("host") {
 config("target") {
   if (current_toolchain != host_toolchain) {
     if (final_executable_type == "shared_library") {
-      if (!build_with_separate_cobalt_toolchain) {
+      if (!sb_is_modular || sb_is_evergreen) {
         # Rewrite main() functions into StarboardMain. TODO: This is a
         # hack, it would be better to be more surgical, here.
         defines = [ "main=StarboardMain" ]

starboard/build/config/starboard_target_type.gni

@@ -17,7 +17,7 @@ declare_args() {
 }
 
 if (starboard_target_type == "") {
-  if (build_with_separate_cobalt_toolchain) {
+  if (sb_is_modular && !sb_is_evergreen) {
     starboard_target_type = "shared_library"
   } else {
     starboard_target_type = "group"

starboard/evergreen/shared/platform_configuration/BUILD.gn

@@ -28,7 +28,7 @@ config("platform_configuration") {
     "-Wl,-u GetEvergreenSabiString",
   ]
 
-  if (!build_with_separate_cobalt_toolchain) {
+  if (sb_is_evergreen) {
     ldflags += [ "-nostdlib" ]
   }
   cflags = [

starboard/linux/shared/platform_configuration/BUILD.gn

@@ -63,8 +63,8 @@ config("compiler_flags") {
       # Do not warn about unused function params.
       "-Wno-unused-parameter",
     ]
-    if (build_with_separate_cobalt_toolchain) {
-      # If we're building modularly, we need visibility.
+    if (sb_is_modular && !sb_is_evergreen) {
+      # If we're building with cobalt toolchain and native linker, we need visibility.
       cflags += [ "-fvisibility=default" ]
     } else {
       # Default visibility to hidden, to enable dead stripping.

starboard/linux/x64x11/BUILD.gn

@@ -16,7 +16,7 @@ static_library("starboard_platform") {
   check_includes = false
 
   sources = [ "//starboard/linux/x64x11/run_starboard_main.cc" ]
-  if (!build_with_separate_cobalt_toolchain) {
+  if (!sb_is_modular || sb_is_evergreen) {
     sources += [ "//starboard/linux/x64x11/main.cc" ]
   }
 
@@ -28,7 +28,7 @@ static_library("starboard_platform") {
   configs += [ "//starboard/build/config:starboard_implementation" ]
 }
 
-if (build_with_separate_cobalt_toolchain) {
+if (sb_is_modular && !sb_is_evergreen) {
   static_library("starboard_platform_with_main") {
     check_includes = false
     sources = [ "//starboard/linux/x64x11/main.cc" ]

starboard/linux/x64x11/clang/3.9/BUILD.gn

@@ -16,7 +16,7 @@ static_library("starboard_platform") {
   check_includes = false
 
   sources = [ "//starboard/linux/x64x11/run_starboard_main.cc" ]
-  if (!build_with_separate_cobalt_toolchain) {
+  if (!sb_is_modular || sb_is_evergreen) {
     sources += [ "//starboard/linux/x64x11/main.cc" ]
   }
 

starboard/linux/x64x11/egl/BUILD.gn

@@ -16,7 +16,7 @@ static_library("starboard_platform") {
   check_includes = false
 
   sources = [ "//starboard/linux/x64x11/run_starboard_main.cc" ]
-  if (!build_with_separate_cobalt_toolchain) {
+  if (!sb_is_modular || sb_is_evergreen) {
     sources += [ "//starboard/linux/x64x11/main.cc" ]
   }
 

starboard/linux/x64x11/gcc/6.3/BUILD.gn

@@ -16,7 +16,7 @@ static_library("starboard_platform") {
   check_includes = false
 
   sources = [ "//starboard/linux/x64x11/run_starboard_main.cc" ]
-  if (!build_with_separate_cobalt_toolchain) {
+  if (!sb_is_modular || sb_is_evergreen) {
     sources += [ "//starboard/linux/x64x11/main.cc" ]
   }
 

starboard/linux/x64x11/shared/BUILD.gn

@@ -45,7 +45,7 @@ static_library("starboard_platform_sources") {
     "//starboard/shared/x11/window_internal.cc",
   ]
 
-  if (!build_with_separate_cobalt_toolchain) {
+  if (!sb_is_modular || sb_is_evergreen) {
     sources += [ "//starboard/linux/x64x11/sanitizer_options.cc" ]
   }
 

starboard/linux/x64x11/shared/platform_configuration/BUILD.gn

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 config("platform_configuration") {
-  if (current_toolchain == default_toolchain &&
-      build_with_separate_cobalt_toolchain) {
+  if (current_toolchain == default_toolchain && sb_is_modular &&
+      !sb_is_evergreen) {
     configs = [ "//starboard/evergreen/x64/platform_configuration" ]
   } else {
     configs = [
@@ -28,7 +28,7 @@ config("platform_configuration") {
 
 config("libraries") {
   configs = [ "//starboard/linux/shared/platform_configuration:libraries" ]
-  if (build_with_separate_cobalt_toolchain) {
+  if (sb_is_modular && !sb_is_evergreen) {
     libs = [ "//third_party/libvpx/platforms/linux-x64/libvpx.so.6" ]
     ldflags = [ "-Wl,-rpath=" + rebase_path("//") +
                 "/third_party/libvpx/platforms/linux-x64/" ]

starboard/linux/x64x11/skia/BUILD.gn

@@ -21,7 +21,7 @@ static_library("starboard_platform") {
     "//starboard/linux/x64x11/skia/configuration.h",
     "//starboard/linux/x64x11/skia/system_get_extensions.cc",
   ]
-  if (!build_with_separate_cobalt_toolchain) {
+  if (!sb_is_modular || sb_is_evergreen) {
     sources += [ "//starboard/linux/x64x11/main.cc" ]
   }
 

third_party/llvm-project/libcxx/BUILD.gn

@@ -119,7 +119,4 @@ static_library("cxx") {
     "//third_party/llvm-project/libcxxabi:cxxabi",
     "//third_party/musl:c",
   ]
-  if (!build_with_separate_cobalt_toolchain) {
-    deps += [ "//third_party/llvm-project/libunwind:unwind_evergreen" ]
-  }
 }

third_party/llvm-project/libcxxabi/BUILD.gn

@@ -90,7 +90,4 @@ static_library("cxxabi") {
   all_dependent_configs = [ ":cxxabi_dependents_config" ]
 
   deps = [ "//third_party/musl:c" ]
-  if (!build_with_separate_cobalt_toolchain) {
-    deps += [ "//third_party/llvm-project/libunwind:unwind_evergreen" ]
-  }
 }