Commit 17a5fbfc authored by jamesr's avatar jamesr Committed by Commit bot

Fix mojom dependencies in media/mojo/services, make gn check pass

This fixes the flaky compilation error seen here:
http://build.chromium.org/p/chromium.lkgr/builders/Win%20x64/builds/2616/steps/compile/logs/stdio

FAILED: ninja -t msvc -e environment.x64 -- "C:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64\cl.exe" /nologo /showIncludes /FC @obj\media\mojo\services\media_mojo_lib.mojo_renderer_impl.obj.rsp /c ..\..\media\mojo\services\mojo_renderer_impl.cc /Foobj\media\mojo\services\media_mojo_lib.mojo_renderer_impl.obj /Fdobj\media\media_mojo_lib.cc.pdb
c:\b\build\slave\win_x64\build\src\mojo\public\cpp\application\connect.h(8) : fatalerror C1083: Cannot open include file: 'mojo/public/interfaces/application/service_provider.mojom.h': No such file or directory
                                                                              ninja: build stopped: subcommand failed.

and makes (ToT) gn check media/mojo/services:* pass

R=scherkus@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#296084}
parent 0dfb6cdf
...@@ -421,6 +421,11 @@ component("media") { ...@@ -421,6 +421,11 @@ component("media") {
] ]
} }
public_deps = [
"//media/base",
"//media/audio",
]
deps += [ deps += [
":shared_memory_support", ":shared_memory_support",
"//base", "//base",
...@@ -429,8 +434,6 @@ component("media") { ...@@ -429,8 +434,6 @@ component("media") {
"//crypto", "//crypto",
"//crypto:platform", # TODO(ajwong): This used to be provided by crypto.gyp via export_dependent_settings "//crypto:platform", # TODO(ajwong): This used to be provided by crypto.gyp via export_dependent_settings
"//gpu/command_buffer/common", "//gpu/command_buffer/common",
"//media/audio",
"//media/base",
"//skia", "//skia",
"//third_party/libyuv", "//third_party/libyuv",
"//third_party/opus", "//third_party/opus",
......
...@@ -1048,6 +1048,8 @@ ...@@ -1048,6 +1048,8 @@
'media', 'media',
'media_mojo_bindings', 'media_mojo_bindings',
'../base/base.gyp:base', '../base/base.gyp:base',
'../mojo/mojo_base.gyp:mojo_application_base',
'../mojo/mojo_base.gyp:mojo_application_bindings',
'../mojo/mojo_base.gyp:mojo_environment_chromium', '../mojo/mojo_base.gyp:mojo_environment_chromium',
'<(mojo_system_for_component)', '<(mojo_system_for_component)',
], ],
......
...@@ -23,12 +23,15 @@ source_set("lib") { ...@@ -23,12 +23,15 @@ source_set("lib") {
# mojo media::Renderer proxy (to a renderer_app) implementation. # mojo media::Renderer proxy (to a renderer_app) implementation.
source_set("renderer_impl_lib") { source_set("renderer_impl_lib") {
deps = [ deps = [
":lib",
"//base", "//base",
"//media", "//media",
"//media/mojo/interfaces",
"//mojo/public/interfaces/application",
"//mojo/common", "//mojo/common",
"//mojo/environment:chromium", "//mojo/environment:chromium",
"//mojo/public/c/system:for_component", "//mojo/public/c/system:for_component",
":lib", "//mojo/public/cpp/application",
] ]
sources = [ sources = [
...@@ -91,6 +94,7 @@ shared_library("renderer_apptest") { ...@@ -91,6 +94,7 @@ shared_library("renderer_apptest") {
"//base", "//base",
"//base/test:test_support", "//base/test:test_support",
"//media", "//media",
"//media:shared_memory_support",
"//media/mojo/interfaces", "//media/mojo/interfaces",
"//mojo/common", "//mojo/common",
"//mojo/application", "//mojo/application",
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
import("//mojo/public/tools/bindings/mojom.gni") import("//mojo/public/tools/bindings/mojom.gni")
# GYP version: mojo/mojo_public.gypi:mojo_application_bindings
mojom("application") { mojom("application") {
sources = [ sources = [
"application.mojom", "application.mojom",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment