Add missing runtime dependencies to *_run targets.

A follow up CL removes dynamic libraries that would be fetched automatically via
implicit dependencies. The target hierarchy needs to be there in the first
place for this to work.

R=jam@chromium.org
BUG=98637
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

Review URL: https://codereview.chromium.org/1242323004

Cr-Commit-Position: refs/heads/master@{#339994}

8 files changed, 21 insertions, 2 deletions

diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
index 0a24de7..3b08e38 100644
--- a/cc/cc_tests.gyp
+++ b/cc/cc_tests.gyp
@@ -295,6 +295,8 @@
         'cc.gyp:cc',
         'cc.gyp:cc_surfaces',
         'cc_test_support',
+        # Only needed at runtime.
+        '../third_party/mesa/mesa.gyp:osmesa',
       ],
       'sources': [
         'test/cc_test_suite.cc',
@@ -410,7 +412,6 @@
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
-        '../third_party/mesa/mesa.gyp:osmesa',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../ui/gfx/gfx.gyp:gfx_test_support',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index bdba72d..70301f4 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -2205,6 +2205,8 @@
         '../ui/resources/ui_resources.gyp:ui_resources',
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
+        # Only needed at runtime.
+        '../third_party/mesa/mesa.gyp:osmesa',
       ],
       'include_dirs': [
         '..',
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 75221d1..f7433cd 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -881,6 +881,8 @@
         'components_strings.gyp:components_strings',
         'components_tests_pak',
         'mime_util/mime_util.gyp:mime_util',
+        # Only needed at runtime.
+        '../third_party/mesa/mesa.gyp:osmesa',
       ],
       'conditions': [
         ['enable_rlz_support==1', {
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index ffcea14..53d8033 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -1015,6 +1015,8 @@
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../ui/gfx/ipc/gfx_ipc.gyp:gfx_ipc',
+        # Only needed at runtime.
+        '../third_party/mesa/mesa.gyp:osmesa',
       ],
       'include_dirs': [
         '..',
@@ -1411,7 +1413,6 @@
             '../testing/gtest.gyp:gtest',
             '../third_party/WebKit/public/blink.gyp:blink',
             '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
-            '../third_party/mesa/mesa.gyp:osmesa',
             '../third_party/mojo/mojo_edk.gyp:mojo_common_test_support',
             '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
             '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
@@ -1427,6 +1428,8 @@
             '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
             '../ui/snapshot/snapshot.gyp:snapshot',
             '../ui/accessibility/accessibility.gyp:ax_gen',
+            # Only needed at runtime.
+            '../third_party/mesa/mesa.gyp:osmesa',
           ],
           'include_dirs': [
             '..',
diff --git a/extensions/extensions_tests.gyp b/extensions/extensions_tests.gyp
index c64180b..85d9df3 100644
--- a/extensions/extensions_tests.gyp
+++ b/extensions/extensions_tests.gyp
@@ -40,6 +40,8 @@
         'extensions.gyp:extensions_utility',
         'extensions_resources.gyp:extensions_resources',
         'extensions_strings.gyp:extensions_strings',
+        # Only needed at runtime.
+        '../third_party/mesa/mesa.gyp:osmesa',
       ],
       # Needed for third_party libraries like leveldb.
       'include_dirs': [
@@ -82,6 +84,8 @@
         '<(DEPTH)/device/usb/usb.gyp:device_usb_mocks',
         '<(DEPTH)/testing/gmock.gyp:gmock',
         '<(DEPTH)/testing/gtest.gyp:gtest',
+        # Only needed at runtime.
+        '../third_party/mesa/mesa.gyp:osmesa',
       ],
       'defines': [
         'HAS_OUT_OF_PROC_TEST_RUNNER',
diff --git a/extensions/shell/app_shell.gyp b/extensions/shell/app_shell.gyp
index 4a41b30..f2e661b 100644
--- a/extensions/shell/app_shell.gyp
+++ b/extensions/shell/app_shell.gyp
@@ -215,6 +215,8 @@
         '<(DEPTH)/extensions/extensions.gyp:extensions_shell_and_test_pak',
         '<(DEPTH)/extensions/extensions.gyp:extensions_test_support',
         '<(DEPTH)/testing/gtest.gyp:gtest',
+        # Only needed at runtime.
+        '../../third_party/mesa/mesa.gyp:osmesa',
       ],
       'sources': [
         '<@(app_shell_unittests_sources)',
diff --git a/ui/app_list/app_list.gyp b/ui/app_list/app_list.gyp
index 1ea28b1..10f21dd 100644
--- a/ui/app_list/app_list.gyp
+++ b/ui/app_list/app_list.gyp
@@ -257,6 +257,8 @@
         '../resources/ui_resources.gyp:ui_test_pak',
         'app_list',
         'app_list_test_support',
+        # Only needed at runtime.
+        '../../third_party/mesa/mesa.gyp:osmesa',
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
diff --git a/ui/wm/wm.gyp b/ui/wm/wm.gyp
index 08a9ded..9a34dce 100644
--- a/ui/wm/wm.gyp
+++ b/ui/wm/wm.gyp
@@ -136,8 +136,11 @@
         '../events/platform/events_platform.gyp:events_platform',
         '../gfx/gfx.gyp:gfx',
         '../gfx/gfx.gyp:gfx_geometry',
+        '../resources/ui_resources.gyp:ui_test_pak',
         'wm',
         'wm_test_support',
+        # Only needed at runtime.
+        '../../third_party/mesa/mesa.gyp:osmesa',
       ],
       'sources': [
         'core/capture_controller_unittest.cc',