commit 9427f48f598cd0ce0ce6987b02a530dd1916aec9
author Mirko Bonadei <mbonadei@webrtc.org> Tue Aug 28 14:39:27 2018 +0200
committer Commit Bot <commit-bot@chromium.org> Wed Aug 29 07:17:25 2018 +0000
tree 968f8218935de06cc7bcf88e2b2edae34872f2e2
parent a687812c7087ade6b9c92f1fc4d68eafe9180f02

rtc_executable should depend on //build/win:default_exe_manifest.

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

diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn
index 99f1ae6..369c7f2 100644
--- a/rtc_tools/BUILD.gn
+++ b/rtc_tools/BUILD.gn
@@ -81,7 +81,6 @@
     ":command_line_parser",
     ":video_quality_analysis",
     "../test:perf_test",
-    "//build/win:default_exe_manifest",
   ]
 }
 
@@ -96,7 +95,6 @@
     deps = [
       ":command_line_parser",
       ":video_quality_analysis",
-      "//build/win:default_exe_manifest",
     ]
   }
 
@@ -119,7 +117,6 @@
     deps = [
       ":command_line_parser",
       ":reference_less_video_analysis_lib",
-      "//build/win:default_exe_manifest",
     ]
   }
 
@@ -134,7 +131,6 @@
     deps = [
       ":command_line_parser",
       "../common_video",
-      "//build/win:default_exe_manifest",
       "//third_party/libyuv",
     ]
   }
@@ -159,7 +155,6 @@
     deps = [
       ":command_line_parser",
       ":frame_editing_lib",
-      "//build/win:default_exe_manifest",
     ]
   }
 
@@ -174,7 +169,6 @@
         "../modules/audio_device",
         "../modules/audio_device:audio_device_impl",
         "../system_wrappers:system_wrappers_default",
-        "//build/win:default_exe_manifest",
       ]
     }
   }
@@ -280,7 +274,6 @@
       "../rtc_base:safe_minmax",
       "../system_wrappers:metrics_default",
       "../test:test_support",
-      "//build/win:default_exe_manifest",
       "//testing/gtest",
     ]
   }

webrtc.gni

diff --git a/webrtc.gni b/webrtc.gni
index ec3c447..8cd1c1d 100644
--- a/webrtc.gni
+++ b/webrtc.gni
@@ -453,6 +453,12 @@
     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",
+      ]
+    }
   }
 }