Reland "Use is_apple instead of is_mac and is_ios everywhere"

BUILD.gn

@@ -443,7 +443,7 @@ angle_static_library("angle_gpu_info_util") {
     libs += [ "pci" ]
   }
 
-  if (is_mac || is_ios) {
+  if (is_apple) {
     frameworks = [
       "IOKit.framework",
       "CoreFoundation.framework",
@@ -485,7 +485,7 @@ angle_static_library("translator") {
     _needs_glsl_base = true
     needs_glsl_and_vulkan_base = true
     sources += angle_translator_glsl_sources
-    if (is_mac || is_ios) {
+    if (is_apple) {
       sources += angle_translator_glsl_mac_sources
     }
     defines += [ "ANGLE_ENABLE_GLSL" ]
@@ -772,7 +772,7 @@ angle_source_set("libANGLE_base") {
     suppressed_configs -= [ "//build/config/clang:find_bad_constructs" ]
   }
 
-  if (is_mac || is_ios) {
+  if (is_apple) {
     sources += libangle_mac_sources
   }
 
@@ -1161,7 +1161,7 @@ if (angle_standalone || build_with_chromium) {
       "${angle_jsoncpp_dir}:jsoncpp_config",
     ]
 
-    if ((is_ios || is_mac) && !is_component_build) {
+    if (is_apple && !is_component_build) {
       ldflags = [
         "-install_name",
         "@rpath/${target_name}.dylib",

gni/angle.gni

@@ -44,6 +44,7 @@ if (angle_has_build) {
     ozone_platform_gbm = false
     use_fuzzing_engine = false
     use_xcode_clang = false
+    is_apple = is_mac || is_ios
   }
 
   declare_args() {
@@ -170,7 +171,7 @@ declare_args() {
 
 declare_args() {
   # TODO(jdarpinian): Support enabling CGL and EAGL at the same time using the soft linking code. Also support disabling both for Metal-only builds.
-  angle_enable_cgl = angle_enable_gl && !angle_enable_eagl && (is_mac || is_ios)
+  angle_enable_cgl = angle_enable_gl && !angle_enable_eagl && is_apple
 
   angle_has_histograms = angle_has_build
 }

src/libANGLE/renderer/gl/BUILD.gn

@@ -233,7 +233,7 @@ config("angle_gl_backend_config") {
   if (angle_enable_gl_null) {
     defines += [ "ANGLE_ENABLE_OPENGL_NULL" ]
   }
-  if (is_mac || is_ios) {
+  if (is_apple) {
     defines += [ "GL_SILENCE_DEPRECATION" ]
   }
   include_dirs = [ "../../../third_party/khronos" ]
@@ -262,7 +262,7 @@ angle_source_set("angle_gl_backend") {
       "Xext",
     ]
   }
-  if (is_mac || is_ios) {
+  if (is_apple) {
     frameworks = [
       "IOSurface.framework",
       "QuartzCore.framework",

src/libGLESv2.gni

@@ -77,7 +77,7 @@ if (is_linux || is_chromeos || is_android || is_fuchsia) {
   ]
 }
 
-if (is_mac || is_ios) {
+if (is_apple) {
   libangle_common_sources += [
     "src/common/apple/SoftLinking.h",
     "src/common/gl/cgl/FunctionsCGL.cpp",

src/tests/BUILD.gn

@@ -12,8 +12,8 @@ declare_args() {
   build_angle_deqp_tests = false
   build_angle_gles1_conform_tests = false
   build_angle_trace_perf_tests = false
-  build_angle_perftests = is_win || is_linux || is_chromeos || is_android ||
-                          is_mac || is_fuchsia || is_ios
+  build_angle_perftests =
+      is_win || is_linux || is_chromeos || is_android || is_apple || is_fuchsia
 }
 
 angle_test("test_utils_unittest_helper") {
@@ -86,7 +86,7 @@ template("angle_common_test_utils") {
       "test_utils/angle_test_platform.h",
       "test_utils/gl_raii.h",
     ]
-    if (is_mac || is_ios) {
+    if (is_apple) {
       sources += [
         "test_utils/angle_test_instantiate_apple.h",
         "test_utils/angle_test_instantiate_apple.mm",
@@ -124,7 +124,7 @@ angle_test("angle_unittests") {
   if (angle_enable_essl && angle_enable_glsl) {
     sources += angle_unittests_compiler_tests_sources
 
-    if (is_mac || is_ios) {
+    if (is_apple) {
       sources += angle_unittests_glsl_mac_sources
     }
   }
@@ -151,8 +151,7 @@ angle_test("angle_unittests") {
   }
 }
 
-if (is_win || is_linux || is_chromeos || is_mac || is_android || is_fuchsia ||
-    is_ios) {
+if (is_win || is_linux || is_chromeos || is_android || is_fuchsia || is_apple) {
   import("angle_end2end_tests.gni")
 
   angle_test("angle_end2end_tests") {
@@ -221,8 +220,7 @@ if (is_win || is_linux || is_chromeos || is_mac || is_android || is_fuchsia ||
   }
 }
 
-if (is_win || is_linux || is_chromeos || is_mac || is_android || is_fuchsia ||
-    is_ios) {
+if (is_win || is_linux || is_chromeos || is_android || is_fuchsia || is_apple) {
   import("angle_white_box_tests.gni")
 
   angle_test("angle_white_box_tests") {
@@ -296,7 +294,7 @@ angle_perftests_common("angle_perftests_static") {
   test_utils = ":angle_common_test_utils_static"
 }
 
-if (is_win || is_linux || is_chromeos || is_android || is_mac || is_ios) {
+if (is_win || is_linux || is_chromeos || is_android || is_apple) {
   import("angle_perftests.gni")
 
   # This test suite is for perf tests that use ANGLE's internals in some direct way.
@@ -314,8 +312,7 @@ if (is_win || is_linux || is_chromeos || is_android || is_mac || is_ios) {
 
     # These tests depend on vulkan_command_buffer_utils, which is
     # not yet compatible with mac and vulkan display/headless backend.
-    if (angle_enable_vulkan && !angle_use_vulkan_display && !is_mac &&
-        !is_ios) {
+    if (angle_enable_vulkan && !angle_use_vulkan_display && !is_apple) {
       sources += angle_white_box_perf_tests_vulkan_sources
       deps += [
         "$angle_glslang_dir:glslang_lib_sources",
@@ -407,7 +404,7 @@ if (build_angle_gles1_conform_tests) {
     ]
 
     # This is used by the tests to typedef uint32_t. For some reason only needed on mac.
-    if (is_mac || is_ios) {
+    if (is_apple) {
       defines += [ "__linux" ]
     }
 
@@ -608,7 +605,7 @@ if (build_angle_gles1_conform_tests) {
     ]
   }
 
-  if (!is_win && !is_mac && !is_ios) {
+  if (!is_win && !is_apple) {
     source_set("angle_gles1_covgl_no_gtest") {
       configs += [
         ":angle_gles1_conform_support",
@@ -910,7 +907,7 @@ if (build_angle_deqp_tests && !is_fuchsia) {
       # This has to be GNU_SOURCE as on Linux dEQP uses syscall()
       defines += [ "_GNU_SOURCE" ]
     }
-    if (is_android || is_mac || is_ios) {
+    if (is_android || is_apple) {
       # _XOPEN_SOURCE=600 is what is used in deqp/src/Android.mk
       defines += [ "_XOPEN_SOURCE=600" ]
     }
@@ -1041,7 +1038,7 @@ if (build_angle_deqp_tests && !is_fuchsia) {
     if (is_win) {
       sources += deqp_framework_delibs_sources_win
     }
-    if (is_linux || is_chromeos || is_android || is_mac || is_ios) {
+    if (is_linux || is_chromeos || is_android || is_apple) {
       sources += deqp_framework_delibs_sources_unix
     }
 
@@ -1479,7 +1476,7 @@ group("angle_tests") {
       ":angle_gles1_covegl_no_gtest",
       ":angle_gles1_primtest_tests",
     ]
-    if (!is_win && !is_mac && !is_ios) {
+    if (!is_win && !is_apple) {
       deps += [ ":angle_gles1_covgl_tests" ]
     }
   }

util/BUILD.gn

@@ -193,7 +193,7 @@ foreach(is_shared_library,
       ]
     }
 
-    if (is_mac || is_ios) {
+    if (is_apple) {
       frameworks = [ "QuartzCore.framework" ]
       if (is_mac) {
         frameworks += [ "AppKit.framework" ]