Revert "[Chromecast] Only include all libstdc++/libgcc symbols in executable as needed"

build/config/chromecast/BUILD.gn

Index: build/config/chromecast/BUILD.gn
diff --git a/build/config/chromecast/BUILD.gn b/build/config/chromecast/BUILD.gn
index c31581be8f31f246220a294954bc644797182b32..f1cbfe61946fb68e18ab195dc1e3e9aae4012ad7 100644
--- a/build/config/chromecast/BUILD.gn
+++ b/build/config/chromecast/BUILD.gn
@@ -6,8 +6,6 @@ import("//build/config/chromecast_build.gni")
 
 assert(is_chromecast)
 
-is_arm_chromecast_device = current_cpu == "arm" && !is_android
-
 config("static_config") {
   ldflags = [
     # We want to statically link libstdc++/libgcc.
@@ -36,10 +34,10 @@ config("ldconfig") {
   ]
 }
 
-# Whole archiving libgcc.a and libstdc++ is needed if dynamic shared libs are
-# used, see b/25566835.
-config("executable_whole_archive_config") {
-  if (is_arm_chromecast_device) {
+config("executable_config") {
+  configs = [ ":ldconfig" ]
+
+  if (current_cpu == "arm") {
     ldflags = [
       # Export stdlibc++ and libgcc symbols to force shlibs to refer to these
       # symbols from the executable.
@@ -47,33 +45,25 @@ config("executable_whole_archive_config") {
 
       "-lm",  # stdlibc++ requires math.h
 
-      # In case we redefined stdlibc++ symbols (e.g. tc_malloc).
+      # In case we redefined stdlibc++ symbols (e.g. tc_malloc)
       "-Wl,--allow-multiple-definition",
 
-      # Adding all symbols from libgcc and libstdc++.
       "-Wl,--whole-archive",
       "-l:libstdc++.a",
       "-l:libgcc.a",
       "-Wl,--no-whole-archive",
     ]
-  }
-}
-
-# Statically linking against libstdc++/libgcc should happen for arm chromecast
-# devices, and is not needed for Android builds.
-config("executable_config") {
-  configs = [ ":ldconfig" ]
 
-  if (is_arm_chromecast_device) {
-    # Statically link libstdc++ and libgcc to avoid having a dynamic dependency
-    # on them.
+    # Despite including libstdc++/libgcc archives, we still need to specify
+    # static linking for them in order to prevent the executable from having a
+    # dynamic dependency on them.
     configs += [ ":static_config" ]
   }
 }
 
 config("shared_library_config") {
   configs = [ ":ldconfig" ]
-  if (is_arm_chromecast_device) {
+  if (current_cpu == "arm") {
     configs += [ ":static_config" ]
   }
 }