Address some TODO(GYP_GONE)s

No intended behavior change. If this breaks your bot because it's trying to build a foo_run target, make it build the corresponding foo target instead (see diff). Depends on https://chromium-review.googlesource.com/#/c/419296/ BUG=673897 CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel TBR=brettw Review-Url: https://codereview.chromium.org/2569333002 Cr-Commit-Position: refs/heads/master@{#466154}
hylschwy · Apr 20, 2017 · 1d66d23 · 1d66d23
1 parent 577ecb1
commit 1d66d23
Show file tree

Hide file tree

Showing 18 changed files with 576 additions and 919 deletions.
diff --git a/breakpad/BUILD.gn b/breakpad/BUILD.gn
@@ -985,13 +985,3 @@ if (is_win) {
     public_configs = [ ":sender_config" ]
   }
 }
-
-if (is_android) {
-  # TODO(GYP_GONE) Delete this after we've converted everything to GN.
-  group("breakpad_unittests_deps") {
-    testonly = true
-    deps = [
-      ":breakpad_unittests",
-    ]
-  }
-}
diff --git a/chrome/installer/linux/BUILD.gn b/chrome/installer/linux/BUILD.gn
@@ -50,18 +50,6 @@ group("linux") {
   ]
 }
 
-# This target is provided for compatibility w/ GYP. Users should always
-# depend directly on :linux instead of this target (we set visibility
-# to the empty list to prevent unwanted callers).
-# TODO(GYP_GONE): Delete this target after we've migrated away from GYP and
-# updated the bots to build :linux instead.
-group("linux_packages_all") {
-  visibility = []
-  deps = [
-    ":linux",
-  ]
-}
-
 branding_dir = "//chrome/app/theme/$branding_path_component"
 branding_dir_100 =
     "//chrome/app/theme/default_100_percent/$branding_path_component"

diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
@@ -250,15 +250,6 @@ static_library("test_support") {
   }
 }
 
-# TODO(GYP_GONE): Delete this after we've converted everything to GN.
-# The _run targets exist only for compatibility w/ GYP.
-group("telemetry_gpu_integration_test_run") {
-  testonly = true
-  deps = [
-    ":telemetry_gpu_integration_test",
-  ]
-}
-
 group("telemetry_gpu_integration_test") {
   testonly = true
   deps = [
@@ -1094,15 +1085,6 @@ if (!is_android) {
     defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
   }
 
-  # TODO(GYP_GONE): Delete this after we've converted everything to GN.
-  # The _run targets exist only for compatibility w/ GYP.
-  group("telemetry_unittests_run") {
-    testonly = true
-    deps = [
-      ":telemetry_unittests",
-    ]
-  }
-
   group("telemetry_unittests") {
     testonly = true
     deps = [
@@ -1155,8 +1137,8 @@ if (!is_android) {
   }
 
   # TODO(GYP_GONE): Delete this after we've converted everything to GN.
-  # The _run targets exist only for compatibility w/ GYP.
-  group("tab_capture_end2end_tests_run") {
+  # This target exist only for compatibility w/ GYP.
+  group("tab_capture_end2end_tests") {
     testonly = true
     deps = [
       ":browser_tests",
@@ -2988,15 +2970,6 @@ if (!is_android) {
   }
 }
 
-# TODO(GYP_GONE): Delete this after we've converted everything to GN.
-# The _run targets exist only for compatibility w/ GYP.
-group("telemetry_perf_unittests_run") {
-  testonly = true
-  deps = [
-    ":telemetry_perf_unittests",
-  ]
-}
-
 group("telemetry_perf_unittests") {
   testonly = true
   deps = [
@@ -5167,15 +5140,6 @@ if (is_android) {
 }
 
 if (is_chromeos && enable_package_mash_services) {
-  # TODO(GYP_GONE): Delete this after we've converted everything to GN.
-  # The _run targets exist only for compatibility w/ GYP.
-  group("mash_browser_tests_run") {
-    testonly = true
-    deps = [
-      ":mash_browser_tests",
-    ]
-  }
-
   group("mash_browser_tests") {
     testonly = true
     data_deps = [

diff --git a/content/test/gpu/generate_buildbot_json.py b/content/test/gpu/generate_buildbot_json.py
@@ -1470,9 +1470,6 @@ def DEFAULT_AND_OPTIONAL(x):
         'os_types': ['android'],
       },
     ],
-    'override_compile_targets': [
-      'tab_capture_end2end_tests_run',
-    ],
   },
   'video_decode_accelerator_d3d11_unittest': {
     'tester_configs': [
@@ -2313,7 +2310,7 @@ def generate_telemetry_test(tester_name, tester_config,
   return generate_isolated_test(tester_name, tester_config, test,
                                 test_config, extra_browser_args,
                                 'telemetry_gpu_integration_test',
-                                ['telemetry_gpu_integration_test_run'],
+                                ['telemetry_gpu_integration_test'],
                                 prefix_args)
 
 def generate_telemetry_tests(tester_name, tester_config,

diff --git a/sandbox/linux/BUILD.gn b/sandbox/linux/BUILD.gn
@@ -434,13 +434,3 @@ if (compile_suid_client || is_nacl_nonsfi) {
     }
   }
 }
-
-if (is_android) {
-  # TODO(GYP_GONE) Delete this after we've converted everything to GN.
-  group("sandbox_linux_unittests_deps") {
-    testonly = true
-    deps = [
-      ":sandbox_linux_unittests",
-    ]
-  }
-}
diff --git a/testing/buildbot/chromium.android.fyi.json b/testing/buildbot/chromium.android.fyi.json
@@ -30,9 +30,6 @@
         "test": "base_unittests"
       },
       {
-        "override_compile_targets": [
-          "breakpad_unittests_deps"
-        ],
         "test": "breakpad_unittests"
       },
       {
@@ -87,9 +84,6 @@
         "test": "net_unittests"
       },
       {
-        "override_compile_targets": [
-          "sandbox_linux_unittests_deps"
-        ],
         "test": "sandbox_linux_unittests"
       },
       {
@@ -132,9 +126,6 @@
         "test": "base_unittests"
       },
       {
-        "override_compile_targets": [
-          "breakpad_unittests_deps"
-        ],
         "test": "breakpad_unittests"
       },
       {
@@ -189,9 +180,6 @@
         "test": "net_unittests"
       },
       {
-        "override_compile_targets": [
-          "sandbox_linux_unittests_deps"
-        ],
         "test": "sandbox_linux_unittests"
       },
       {
@@ -848,9 +836,6 @@
         "test": "base_unittests"
       },
       {
-        "override_compile_targets": [
-          "breakpad_unittests_deps"
-        ],
         "override_isolate_target": "breakpad_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -1520,9 +1505,6 @@
         "test": "net_unittests"
       },
       {
-        "override_compile_targets": [
-          "sandbox_linux_unittests_deps"
-        ],
         "override_isolate_target": "sandbox_linux_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -1803,9 +1785,6 @@
         "test": "base_unittests"
       },
       {
-        "override_compile_targets": [
-          "breakpad_unittests_deps"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": false
         },
@@ -1916,9 +1895,6 @@
         "test": "net_unittests"
       },
       {
-        "override_compile_targets": [
-          "sandbox_linux_unittests_deps"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": false
         },
@@ -1997,9 +1973,6 @@
         "test": "base_unittests"
       },
       {
-        "override_compile_targets": [
-          "breakpad_unittests_deps"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": false
         },
@@ -2110,9 +2083,6 @@
         "test": "net_unittests"
       },
       {
-        "override_compile_targets": [
-          "sandbox_linux_unittests_deps"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": false
         },

diff --git a/testing/buildbot/chromium.android.json b/testing/buildbot/chromium.android.json
@@ -1295,9 +1295,6 @@
         "test": "base_unittests"
       },
       {
-        "override_compile_targets": [
-          "breakpad_unittests_deps"
-        ],
         "test": "breakpad_unittests"
       },
       {
@@ -1352,9 +1349,6 @@
         "test": "net_unittests"
       },
       {
-        "override_compile_targets": [
-          "sandbox_linux_unittests_deps"
-        ],
         "test": "sandbox_linux_unittests"
       },
       {
@@ -1463,9 +1457,6 @@
         "test": "base_unittests"
       },
       {
-        "override_compile_targets": [
-          "breakpad_unittests_deps"
-        ],
         "override_isolate_target": "breakpad_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -2060,9 +2051,6 @@
         "test": "net_unittests"
       },
       {
-        "override_compile_targets": [
-          "sandbox_linux_unittests_deps"
-        ],
         "override_isolate_target": "sandbox_linux_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -2521,9 +2509,6 @@
         "test": "base_unittests"
       },
       {
-        "override_compile_targets": [
-          "breakpad_unittests_deps"
-        ],
         "test": "breakpad_unittests"
       },
       {
@@ -2575,9 +2560,6 @@
         "test": "net_unittests"
       },
       {
-        "override_compile_targets": [
-          "sandbox_linux_unittests_deps"
-        ],
         "test": "sandbox_linux_unittests"
       },
       {
@@ -4002,9 +3984,6 @@
         "test": "base_unittests"
       },
       {
-        "override_compile_targets": [
-          "breakpad_unittests_deps"
-        ],
         "test": "breakpad_unittests"
       },
       {
@@ -4056,9 +4035,6 @@
         "test": "net_unittests"
       },
       {
-        "override_compile_targets": [
-          "sandbox_linux_unittests_deps"
-        ],
         "test": "sandbox_linux_unittests"
       },
       {