Remove manual references to exe_and_shlib_deps

After [1], a manual dependency on exe_and_shlib_deps is no longer necessary since it's automatically added. This CL removes all remaining manual references to exe_and_shlib_deps. [1] https://chromium.googlesource.com/chromium/src.git/+/d7ed1f0a9c28c932fddc834ca5de44f28266c7f5 BUG=chromium:845700 Change-Id: I66bcead6586050bf952c4aa1f4d3f726c88d2277 Reviewed-on: https://chromium-review.googlesource.com/1091231Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>

Remove manual references to exe_and_shlib_deps
a4a3c19a · Tom Anderson · Commit Bot · 5da6690f · a4a3c19a · a4a3c19a
Commit a4a3c19a authored Jun 07, 2018 by Tom Anderson Committed by Commit Bot Jun 08, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 15 deletions

BUILD.gn BUILD.gn +0 -6

BUILD.gn src/tests/BUILD.gn +1 -1

BUILD.gn third_party/glslang/BUILD.gn +0 -3

BUILD.gn third_party/vulkan-validation-layers/BUILD.gn +1 -5

No files found.
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -661,7 +661,6 @@ shared_library("libGLESv2${angle_libs_suffix}") {
  deps = [
    ":includes",
    ":libANGLE",
-    "//build/config:exe_and_shlib_deps",
  ]
 }

@@ -724,7 +723,6 @@ shared_library("libGLESv1_CM${angle_libs_suffix}") {
  deps = [
    ":includes",
    ":libGLESv2${angle_libs_suffix}",
-    "//build/config:exe_and_shlib_deps",
  ]
 }

@@ -784,7 +782,6 @@ shared_library("libEGL${angle_libs_suffix}") {
  deps = [
    ":includes",
    ":libGLESv2${angle_libs_suffix}",
-    "//build/config:exe_and_shlib_deps",
  ]
 }

@@ -902,8 +899,6 @@ foreach(is_shared_library,
    if (is_shared_library) {
      defines = [ "LIBANGLE_UTIL_IMPLEMENTATION" ]

-      deps += [ "//build/config:exe_and_shlib_deps" ]
-
      if (is_mac && !is_component_build) {
        ldflags = [
          "-install_name",
@@ -927,7 +922,6 @@ executable("angle_shader_translator") {

  deps = [
    ":translator",
-    "//build/config:exe_and_shlib_deps",
  ]
 }


--- a/src/tests/BUILD.gn
+++ b/src/tests/BUILD.gn
@@ -706,7 +706,7 @@ if (build_angle_deqp_tests) {
    shared_library(shared_library_name) {
      deps = [
        ":angle_deqp_libtester",
-        "//build/config:exe_and_shlib_deps",
+
        angle_root + ":angle_util",
      ]


--- a/third_party/glslang/BUILD.gn
+++ b/third_party/glslang/BUILD.gn
@@ -140,9 +140,6 @@ executable("glslang_validator") {
  ]
  configs -= [ "//build/config/compiler:chromium_code" ]
  configs += [ "//build/config/compiler:no_chromium_code" ]
-  deps = [
-    "//build/config:exe_and_shlib_deps",
-  ]
  public_deps = [
    ":glslang",
  ]

--- a/third_party/vulkan-validation-layers/BUILD.gn
+++ b/third_party/vulkan-validation-layers/BUILD.gn
@@ -492,10 +492,7 @@ if (!is_android) {
  shared_library("VkICD_mock_icd") {
    configs -= vulkan_undefine_configs
    public_configs = [ ":vulkan_config" ]
-    deps = [
-      "//build/config:exe_and_shlib_deps",
-    ]
-    deps += [ ":vulkan_generate_mock_icd_files" ]
+    deps = [ ":vulkan_generate_mock_icd_files" ]
    data_deps = [
      ":vulkan_gen_icd_json_file",
    ]
@@ -609,7 +606,6 @@ foreach(layer_info, layers) {
    deps = [
      ":vulkan_layer_table",
      ":vulkan_layer_utils",
-      "//build/config:exe_and_shlib_deps",
    ]
    if (layer_info[2] != "") {
      deps += [ layer_info[2] ]