[ios] Partially decouple iOS and macOS GN configuration.

build/config/mac/BUILD.gn

Index: build/config/mac/BUILD.gn
diff --git a/build/config/mac/BUILD.gn b/build/config/mac/BUILD.gn
index 84180e6a65af14b4c9f887498bb8463365b4ed41..0f7cecc8458d73461a69302a7c293ff6fd8e4373 100644
--- a/build/config/mac/BUILD.gn
+++ b/build/config/mac/BUILD.gn
@@ -6,16 +6,8 @@ import("//build/config/sysroot.gni")
 import("//build/config/mac/mac_sdk.gni")
 import("//build/config/mac/symbols.gni")
 
-if (is_ios) {
-  # This needs to be imported after mac_sdk.gni as it overrides some of the
-  # variables defined by it.
-  import("//build/config/ios/ios_sdk.gni")
-}
-
 # This is included by reference in the //build/config/compiler config that
 # is applied to all targets. It is here to separate out the logic.
-#
-# This is applied to BOTH desktop Mac and iOS targets.
 config("compiler") {
   # These flags are shared between the C compiler and linker.
   common_mac_flags = []
@@ -31,16 +23,6 @@ config("compiler") {
       "-arch",
       "i386",
     ]
-  } else if (current_cpu == "armv7" || current_cpu == "arm") {
-    common_mac_flags += [
-      "-arch",
-      "armv7",
-    ]
-  } else if (current_cpu == "arm64") {
-    common_mac_flags += [
-      "-arch",
-      "arm64",
-    ]
   }
 
   # This is here so that all files get recompiled after an Xcode update.
@@ -60,16 +42,7 @@ config("compiler") {
 
   ldflags = common_mac_flags
 
-  if (is_ios && additional_toolchains != []) {
-    # For fat build, the generation of the dSYM happens after the fat binary has
-    # been created with "lipo" thus the stripping cannot happen at link time but
-    # after running "lipo" too.
-    _save_unstripped_output = false
-  } else {
-    _save_unstripped_output = save_unstripped_output
-  }
-
-  if (_save_unstripped_output) {
+  if (save_unstripped_output) {
     ldflags += [ "-Wcrl,unstripped," + rebase_path(root_out_dir) ]
   }
 }
@@ -89,13 +62,11 @@ config("runtime_library") {
   cflags = common_flags
   ldflags = common_flags
 
-  if (is_mac) {
-    # Prevent Mac OS X AssertMacros.h from defining macros that collide
-    # with common names, like 'check', 'require', and 'verify'.
-    # (Included by system header. Also exists on iOS but not included.)
-    # http://opensource.apple.com/source/CarbonHeaders/CarbonHeaders-18.1/AssertMacros.h
-    defines = [ "__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE=0" ]
-  }
+  # Prevent Mac OS X AssertMacros.h (included by system header) from defining
+  # macros that collide with common names, like 'check', 'require', and
+  # 'verify'.
+  # http://opensource.apple.com/source/CarbonHeaders/CarbonHeaders-18.1/AssertMacros.h
+  defines = [ "__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE=0" ]
 }
 
 # On Mac, this is used for everything except static libraries.
@@ -127,10 +98,7 @@ config("mac_executable_flags") {
 # from a binary, but some targets may wish to specify a saves file to preserve
 # specific symbols.
 config("strip_all") {
-  # On iOS, the final applications are assembled using lipo (to support fat
-  # builds). This configuration is thus always empty and the correct flags
-  # are passed to the linker_driver.py script directly during the lipo call.
-  if (enable_stripping && !is_ios) {
+  if (enable_stripping) {
     ldflags = [ "-Wcrl,strip,-x,-S" ]
   }
 }