Skip to content

Commit

Permalink
Add GYP support for Chrome's mojo manifest
Browse files Browse the repository at this point in the history
BUG=None

Review URL: https://codereview.chromium.org/1796033002

Cr-Commit-Position: refs/heads/master@{#381193}
  • Loading branch information
krockot authored and Commit bot committed Mar 15, 2016
1 parent f0099ca commit 28b466c
Show file tree
Hide file tree
Showing 2 changed files with 76 additions and 1 deletion.
36 changes: 35 additions & 1 deletion content/content.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -183,6 +210,8 @@
'../build/android/disable_gcc_lto.gypi',
],
'dependencies': [
'chrome_manifest',
'chrome_renderer_manifest',
'content_common',
'content_resources',
],
Expand Down Expand Up @@ -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'],
Expand Down
41 changes: 41 additions & 0 deletions mojo/public/mojo_application_manifest.gypi
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# Copyright 2016 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

{
'variables': {
'variables': {
'application_name%': '<(application_name)',
'application_type%': '<(application_type)',
},
'application_type%': '<(application_type)',
'application_name%': '<(application_name)',
'manifest_collator_script%':
'<(DEPTH)/mojo/public/tools/manifest/manifest_collator.py',
'source_manifest%': '<(source_manifest)',
'conditions': [
['application_type=="mojo"', {
'output_manifest%': '<(PRODUCT_DIR)/<(application_name)/manifest.json',
}, {
'output_manifest%': '<(PRODUCT_DIR)/<(application_name)_manifest.json',
}],
],
},
'actions': [{
'action_name': '<(_target_name)_collation',
'inputs': [
'<(manifest_collator_script)',
'<(source_manifest)',
],
'outputs': [
'<(output_manifest)',
],
'action': [
'python',
'<(manifest_collator_script)',
'--application-name', '<(application_name)',
'--parent=<(source_manifest)',
'--output=<(output_manifest)',
],
}],
}

0 comments on commit 28b466c

Please sign in to comment.