Ship SwiftShader on MacOS

Also fixed swiftshader symbol generation on MacOS

Bug: chromium:719257 chromium:888082
Change-Id: I5e8754c278914c519e71c77ed792f198516a1556
Reviewed-on: https://chromium-review.googlesource.com/c/1276550Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Alexis Hétu <sugoi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#598874}

chrome/BUILD.gn

@@ -985,10 +985,8 @@ if (is_win) {
     }
   }
 
-  # EGL on MacOS can be used in dev builds and on bots for test
-  # related purposes, but it is not yet desired to ship these
-  # libraries with official chrome (http://crbug.com/757974).
-  bundle_egl_libraries = use_egl && !(is_chrome_branded && is_official_build)
+  # EGL on MacOS ships with official chrome
+  bundle_egl_libraries = use_egl
 
   if (bundle_egl_libraries) {
     # Add the ANGLE .dylibs in the MODULE_DIR of Chromium.app
@@ -1350,6 +1348,8 @@ if (is_win) {
       "$root_out_dir/$chrome_helper_name.app/Contents/MacOS/$chrome_helper_name",
       "$root_out_dir/$chrome_product_full_name.app/Contents/MacOS/$chrome_product_full_name",
       "$root_out_dir/crashpad_handler",
+      "$root_out_dir/libswiftshader_libEGL.dylib",
+      "$root_out_dir/libswiftshader_libGLESv2.dylib",
     ]
 
     # It is possible to run dump_syms on unstripped products without dSYMs,
@@ -1368,7 +1368,7 @@ if (is_win) {
                rebase_path("$root_out_dir/dump_syms"),
                "-g",
                rebase_path(
-                   "$root_out_dir/{{source_name_part}}.dSYM/Contents/Resources/DWARF/{{source_name_part}}",
+                   "$root_out_dir/{{source_file_part}}.dSYM/Contents/Resources/DWARF/{{source_file_part}}",
                    root_out_dir),
                "{{source}}",
              ]
@@ -1380,6 +1380,8 @@ if (is_win) {
         "//chrome/browser/ui/cocoa/notifications:alert_notification_xpc_service",
         "//third_party/breakpad:dump_syms",
         "//third_party/crashpad/crashpad/handler:crashpad_handler",
+        "//third_party/swiftshader/src/OpenGL/libEGL:swiftshader_libEGL",
+        "//third_party/swiftshader/src/OpenGL/libGLESv2:swiftshader_libGLESv2",
       ]
     }
 
@@ -1396,6 +1398,8 @@ if (is_win) {
         "$root_out_dir/$chrome_helper_name.dSYM",
         "$root_out_dir/$chrome_product_full_name.dSYM",
         "$root_out_dir/crashpad_handler.dSYM",
+        "$root_out_dir/libswiftshader_libEGL.dylib.dSYM",
+        "$root_out_dir/libswiftshader_libGLESv2.dylib.dSYM",
       ]
 
       sources = _chrome_symbols_sources
@@ -1415,6 +1419,8 @@ if (is_win) {
         ":chrome_helper_app",
         "//chrome/browser/ui/cocoa/notifications:alert_notification_xpc_service",
         "//third_party/crashpad/crashpad/handler:crashpad_handler",
+        "//third_party/swiftshader/src/OpenGL/libEGL:swiftshader_libEGL",
+        "//third_party/swiftshader/src/OpenGL/libGLESv2:swiftshader_libGLESv2",
       ]
     }
   } else {