Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1349)

Unified Diff: content/shell/BUILD.gn

Issue 1240893004: Preliminary support for Windows manifests in the GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cloud_print/service/win/service.gyp ('k') | remoting/host/win/common-controls.manifest » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/BUILD.gn
diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn
index a79f48cd590779da56fc2d6a3c91a5d4487ea6b4..661b33b73119cafa064de34af1047606dc6d5ea7 100644
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -4,6 +4,7 @@
import("//build/config/features.gni")
import("//build/config/ui.gni")
+import("//build/config/win/manifest.gni")
import("//tools/grit/repack.gni")
import("//tools/grit/grit_rule.gni")
if (is_android) {
@@ -394,12 +395,13 @@ repack("pak") {
# TODO(GYP): Figure out what this should be on android
# and make linking this work on the Mac.
if (!is_android && !is_mac) {
+ # TODO(brettw) when GYP is no longer necessary, delete
+ # content/shell/app/shell.exe.manifest. This file is not used in GN.
executable("content_shell") {
testonly = true
# TODO(GYP) mac resource bundle stuff for this target.
# TODO(GYP) Windows content shell settings:
- # - Manifest.
# - RC file.
# - 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
sources = [
@@ -410,6 +412,7 @@ if (!is_android && !is_mac) {
":content_shell_lib",
":pak",
"//base/allocator",
+ "//build/win:default_exe_manifest",
]
if (is_win) {
« no previous file with comments | « cloud_print/service/win/service.gyp ('k') | remoting/host/win/common-controls.manifest » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698