0

Add missing dependencies to the GYP build.

Adds dependencies that local work on moving the location in which code
from the Mojo repo is pulled in to Chromium shook out.

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

Cr-Commit-Position: refs/heads/master@{#305192}
This commit is contained in:
blundell
2014-11-21 02:08:23 -08:00
committed by Commit bot
parent d537d6c355
commit 75c75366d0
5 changed files with 18 additions and 0 deletions

@ -16,6 +16,10 @@
],
'dependencies': [
'<(DEPTH)/chrome/common/extensions/api/api.gyp:chrome_api',
# Different APIs include headers from these targets.
"<(DEPTH)/content/content.gyp:content_browser",
# Different APIs include some headers from chrome/common that in turn
# include generated headers from these targets.
# TODO(brettw) this should be made unnecessary if possible.

@ -268,6 +268,9 @@
'content_common',
'content_resources',
],
'export_dependent_settings': [
'content_common',
],
'conditions': [
['chromium_enable_vtune_jit_for_v8==1', {
'dependencies': [
@ -402,6 +405,7 @@
'target_name': 'content_renderer',
'type': 'none',
'dependencies': ['content'],
'export_dependent_settings': ['content'],
},
{
# GN version: //content/utility

@ -1679,6 +1679,9 @@
'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
'../ui/surface/surface.gyp:surface',
],
'export_dependent_settings': [
'../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
],
}],
['enable_basic_printing==1 or enable_print_preview==1', {
'dependencies': [

@ -578,6 +578,9 @@
'../ui/gl/gl.gyp:gl',
'../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
],
'export_dependent_settings' : [
'../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
],
'actions': [
{
'action_name': 'generate_webkit_version',

@ -180,6 +180,7 @@
['OS!="ios"', {
# layouttest_support_content is not supported nor required on iOS.
'dependencies': [
'content.gyp:content_renderer',
'test_support_content',
'../skia/skia.gyp:skia',
'../ui/accessibility/accessibility.gyp:ax_gen',
@ -218,6 +219,9 @@
'content.gyp:content_browser',
'content.gyp:content_common',
],
'export_dependent_settings': [
'content.gyp:content_browser',
],
'include_dirs': [
'..',
],