From 9427f48f598cd0ce0ce6987b02a530dd1916aec9 Mon Sep 17 00:00:00 2001
From: Mirko Bonadei <mbonadei@webrtc.org>
Date: Tue, 28 Aug 2018 14:39:27 +0200
Subject: [PATCH] rtc_executable should depend on
 //build/win:default_exe_manifest.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug: None
Change-Id: I34bcbaa50a0dd669316ff6e7ae8c1e4c35ba742b
Reviewed-on: https://webrtc-review.googlesource.com/96500
Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24471}
---
 rtc_tools/BUILD.gn | 7 -------
 webrtc.gni         | 6 ++++++
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn
index 99f1ae6b4f..369c7f25ad 100644
--- a/rtc_tools/BUILD.gn
+++ b/rtc_tools/BUILD.gn
@@ -81,7 +81,6 @@ rtc_executable("frame_analyzer") {
     ":command_line_parser",
     ":video_quality_analysis",
     "../test:perf_test",
-    "//build/win:default_exe_manifest",
   ]
 }
 
@@ -96,7 +95,6 @@ if (!build_with_chromium) {
     deps = [
       ":command_line_parser",
       ":video_quality_analysis",
-      "//build/win:default_exe_manifest",
     ]
   }
 
@@ -119,7 +117,6 @@ if (!build_with_chromium) {
     deps = [
       ":command_line_parser",
       ":reference_less_video_analysis_lib",
-      "//build/win:default_exe_manifest",
     ]
   }
 
@@ -134,7 +131,6 @@ if (!build_with_chromium) {
     deps = [
       ":command_line_parser",
       "../common_video",
-      "//build/win:default_exe_manifest",
       "//third_party/libyuv",
     ]
   }
@@ -159,7 +155,6 @@ if (!build_with_chromium) {
     deps = [
       ":command_line_parser",
       ":frame_editing_lib",
-      "//build/win:default_exe_manifest",
     ]
   }
 
@@ -174,7 +169,6 @@ if (!build_with_chromium) {
         "../modules/audio_device",
         "../modules/audio_device:audio_device_impl",
         "../system_wrappers:system_wrappers_default",
-        "//build/win:default_exe_manifest",
       ]
     }
   }
@@ -280,7 +274,6 @@ if (rtc_include_tests) {
       "../rtc_base:safe_minmax",
       "../system_wrappers:metrics_default",
       "../test:test_support",
-      "//build/win:default_exe_manifest",
       "//testing/gtest",
     ]
   }
diff --git a/webrtc.gni b/webrtc.gni
index ec3c4478fe..8cd1c1df34 100644
--- a/webrtc.gni
+++ b/webrtc.gni
@@ -453,6 +453,12 @@ template("rtc_executable") {
     if (defined(invoker.public_configs)) {
       public_configs += invoker.public_configs
     }
+    if (is_win) {
+      deps += [
+        # Give executables the default manifest on Windows (a no-op elsewhere).
+        "//build/win:default_exe_manifest",
+      ]
+    }
   }
 }