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

Unified Diff: content/content.gyp

Issue 1796033002: Add GYP support for Chrome's mojo manifest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 | « no previous file | mojo/public/mojo_application_manifest.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content.gyp
diff --git a/content/content.gyp b/content/content.gyp
index 1cda568d9df881b7d6591e08dd1d1a52d7948325..765dcd5a4d1b6f417ea3735dfdc0e50c3db0b891 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -58,6 +58,33 @@
'public/common/feature_h264_with_openh264_ffmpeg.h',
],
},
+ {
+ # GN version: //content/browser:chrome_manifest
+ 'target_name': 'chrome_manifest',
+ 'type': 'none',
+ 'variables': {
+ 'application_type': 'exe',
+ 'application_name': 'chrome',
+ 'source_manifest': '<(DEPTH)/content/browser/mojo/chrome_manifest.json',
+ },
+ 'includes': [
+ '../mojo/public/mojo_application_manifest.gypi',
+ ],
+ },
+ {
+ # GN version: //content/browser:chrome_renderer_manifest
+ 'target_name': 'chrome_renderer_manifest',
+ 'type': 'none',
+ 'variables': {
+ 'application_type': 'exe',
+ 'application_name': 'chrome_renderer',
+ 'source_manifest':
+ '<(DEPTH)/content/browser/mojo/chrome_renderer_manifest.json',
+ },
+ 'includes': [
+ '../mojo/public/mojo_application_manifest.gypi',
+ ],
+ },
],
'includes': [
'../build/win_precompile.gypi',
@@ -183,6 +210,8 @@
'../build/android/disable_gcc_lto.gypi',
],
'dependencies': [
+ 'chrome_manifest',
+ 'chrome_renderer_manifest',
'content_common',
'content_resources',
],
@@ -380,7 +409,12 @@
# GN version: //content/common and //content/public/common
'target_name': 'content_common',
'type': 'none',
- 'dependencies': ['content', 'content_resources'],
+ 'dependencies': [
+ 'chrome_manifest',
+ 'chrome_renderer_manifest',
+ 'content',
+ 'content_resources'
+ ],
# Disable c4267 warnings until we fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267, ],
'export_dependent_settings': ['content'],
« no previous file with comments | « no previous file | mojo/public/mojo_application_manifest.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698