From 625255b6f8a6f6ee4b7b1eab8202b47c46659fb7 Mon Sep 17 00:00:00 2001
From: Tom Anderson <thomasanderson@chromium.org>
Date: Wed, 30 May 2018 18:18:11 +0000
Subject: 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
R=thestig

Change-Id: I5708e7c662b24493d1216f9a802dfce3de5dbea6
Reviewed-on: https://pdfium-review.googlesource.com/33151
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
---
 BUILD.gn                  |  1 -
 samples/BUILD.gn          |  1 -
 testing/test.gni          |  6 ------
 third_party/yasm/BUILD.gn | 12 ------------
 4 files changed, 20 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index 0a84db82e3..a7af222d16 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -3081,7 +3081,6 @@ if (pdf_is_standalone) {
     deps = [
       ":image_diff",
       ":pdfium",
-      "//build/config:exe_and_shlib_deps",
       "//build/win:default_exe_manifest",
     ]
     configs -= [ "//build/config/compiler:chromium_code" ]
diff --git a/samples/BUILD.gn b/samples/BUILD.gn
index 72f13026b3..3274338d49 100644
--- a/samples/BUILD.gn
+++ b/samples/BUILD.gn
@@ -62,7 +62,6 @@ executable("pdfium_test") {
     "../:image_diff",
     "../:pdfium",
     "../:test_support",
-    "//build/config:exe_and_shlib_deps",
     "//build/win:default_exe_manifest",
   ]
   configs += [ ":pdfium_samples_config" ]
diff --git a/testing/test.gni b/testing/test.gni
index 3b9eddc4ee..b69a0706ec 100644
--- a/testing/test.gni
+++ b/testing/test.gni
@@ -227,10 +227,6 @@ template("test") {
       }
       extra_substitutions += [ "GTEST_BUNDLE_ID_SUFFIX=$_bundle_id_suffix" ]
 
-      if (!defined(deps)) {
-        deps = []
-      }
-      deps += [ "//build/config:exe_and_shlib_deps" ]
       if (!defined(bundle_deps)) {
         bundle_deps = []
       }
@@ -243,8 +239,6 @@ template("test") {
 
       testonly = true
       deps += [
-        "//build/config:exe_and_shlib_deps",
-
         # Give tests the default manifest on Windows (a no-op elsewhere).
         "//build/win:default_exe_manifest",
       ]
diff --git a/third_party/yasm/BUILD.gn b/third_party/yasm/BUILD.gn
index 94dbf9131c..3a6e88570c 100644
--- a/third_party/yasm/BUILD.gn
+++ b/third_party/yasm/BUILD.gn
@@ -86,8 +86,6 @@ if (current_toolchain == host_toolchain) {
       "//build/config/compiler:no_chromium_code",
     ]
     deps = [
-      "//build/config:exe_and_shlib_deps",
-
       # Default manifest on Windows (a no-op elsewhere).
       "//build/win:default_exe_manifest",
     ]
@@ -103,8 +101,6 @@ if (current_toolchain == host_toolchain) {
       "//build/config/compiler:no_chromium_code",
     ]
     deps = [
-      "//build/config:exe_and_shlib_deps",
-
       # Default manifest on Windows (a no-op elsewhere).
       "//build/win:default_exe_manifest",
     ]
@@ -128,7 +124,6 @@ if (current_toolchain == host_toolchain) {
 
     deps = [
       ":yasm_utils",
-      "//build/config:exe_and_shlib_deps",
 
       # Default manifest on Windows (a no-op elsewhere).
       "//build/win:default_exe_manifest",
@@ -164,8 +159,6 @@ if (current_toolchain == host_toolchain) {
       "//build/config/compiler:no_chromium_code",
     ]
     deps = [
-      "//build/config:exe_and_shlib_deps",
-
       # Default manifest on Windows (a no-op elsewhere).
       "//build/win:default_exe_manifest",
     ]
@@ -181,8 +174,6 @@ if (current_toolchain == host_toolchain) {
       "//build/config/compiler:no_chromium_code",
     ]
     deps = [
-      "//build/config:exe_and_shlib_deps",
-
       # Default manifest on Windows (a no-op elsewhere).
       "//build/win:default_exe_manifest",
     ]
@@ -225,8 +216,6 @@ if (current_toolchain == host_toolchain) {
       ":re2c_warnings",
     ]
     deps = [
-      "//build/config:exe_and_shlib_deps",
-
       # Default manifest on Windows (a no-op elsewhere).
       "//build/win:default_exe_manifest",
     ]
@@ -378,7 +367,6 @@ if (current_toolchain == host_toolchain) {
       ":generate_module",
       ":generate_version",
       ":yasm_utils",
-      "//build/config:exe_and_shlib_deps",
 
       # Default manifest on Windows (a no-op elsewhere).
       "//build/win:default_exe_manifest",
-- 
cgit v1.2.3