diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-27 22:07:43 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-27 22:07:43 +0000 |
| commit | a4b0f408ac92589d244e6d0ca05309865c5ec5aa (patch) | |
| tree | 571bf91e0cb5a3a378f79067b3c16a787a7f539d /mojo/shell | |
| parent | 16dcbb6a94d4d5ac8d1f0761718de38a0eeacd0b (diff) | |
| download | chromium_src-a4b0f408ac92589d244e6d0ca05309865c5ec5aa.zip chromium_src-a4b0f408ac92589d244e6d0ca05309865c5ec5aa.tar.gz chromium_src-a4b0f408ac92589d244e6d0ca05309865c5ec5aa.tar.bz2 | |
Mojo: Include "path/to/foo.mojom.h"
Given path/to/foo.mojom, change the code generator to output:
<(SHARED_INTERMEDIATE_DIR)/path/to/foo.mojom.cc
<(SHARED_INTERMEDIATE_DIR)/path/to/foo.mojom.h
<(SHARED_INTERMEDIATE_DIR)/path/to/foo.mojom-internal.h
This involves shelling out to a python script to compute "path/to" part as that is not otherwise available from GYP. See build/inverse_depth.py.
DEPTH is now passed to mojom_bindings_generator.py so that it can similarly compute "path/to". With that, we no longer need the include_dir argument, so I dropped it.
R=davemoore@chromium.org, mark@chromium.org
Review URL: https://codereview.chromium.org/177183002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253937 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/shell')
| -rw-r--r-- | mojo/shell/dynamic_service_loader.cc | 1 | ||||
| -rw-r--r-- | mojo/shell/dynamic_service_loader.h | 2 | ||||
| -rw-r--r-- | mojo/shell/service_manager.cc | 1 | ||||
| -rw-r--r-- | mojo/shell/service_manager.h | 2 | ||||
| -rw-r--r-- | mojo/shell/service_manager_unittest.cc | 4 |
5 files changed, 4 insertions, 6 deletions
diff --git a/mojo/shell/dynamic_service_loader.cc b/mojo/shell/dynamic_service_loader.cc index 4c62dd9..4168fdf 100644 --- a/mojo/shell/dynamic_service_loader.cc +++ b/mojo/shell/dynamic_service_loader.cc @@ -12,7 +12,6 @@ #include "mojo/shell/context.h" #include "mojo/shell/keep_alive.h" #include "mojo/shell/switches.h" -#include "mojom/shell.h" typedef MojoResult (*MojoMainFunction)(MojoHandle pipe); diff --git a/mojo/shell/dynamic_service_loader.h b/mojo/shell/dynamic_service_loader.h index aef76df..bdb995c 100644 --- a/mojo/shell/dynamic_service_loader.h +++ b/mojo/shell/dynamic_service_loader.h @@ -8,10 +8,10 @@ #include <map> #include "base/basictypes.h" +#include "mojo/public/shell/shell.mojom.h" #include "mojo/public/system/core_cpp.h" #include "mojo/shell/keep_alive.h" #include "mojo/shell/service_manager.h" -#include "mojom/shell.h" #include "url/gurl.h" namespace mojo { diff --git a/mojo/shell/service_manager.cc b/mojo/shell/service_manager.cc index 97a0d51..15146a8 100644 --- a/mojo/shell/service_manager.cc +++ b/mojo/shell/service_manager.cc @@ -8,7 +8,6 @@ #include "mojo/public/bindings/allocation_scope.h" #include "mojo/public/bindings/error_handler.h" #include "mojo/public/bindings/remote_ptr.h" -#include "mojom/shell.h" namespace mojo { namespace shell { diff --git a/mojo/shell/service_manager.h b/mojo/shell/service_manager.h index b21393a..fa396c7 100644 --- a/mojo/shell/service_manager.h +++ b/mojo/shell/service_manager.h @@ -9,8 +9,8 @@ #include "base/basictypes.h" #include "base/callback.h" +#include "mojo/public/shell/shell.mojom.h" #include "mojo/public/system/core_cpp.h" -#include "mojom/shell.h" #include "url/gurl.h" namespace mojo { diff --git a/mojo/shell/service_manager_unittest.cc b/mojo/shell/service_manager_unittest.cc index ac5d1ba..0f17b1d 100644 --- a/mojo/shell/service_manager_unittest.cc +++ b/mojo/shell/service_manager_unittest.cc @@ -6,10 +6,10 @@ #include "mojo/public/bindings/remote_ptr.h" #include "mojo/public/environment/environment.h" #include "mojo/public/shell/application.h" +#include "mojo/public/shell/shell.mojom.h" #include "mojo/public/utility/run_loop.h" #include "mojo/shell/service_manager.h" -#include "mojom/shell.h" -#include "mojom/test.h" +#include "mojo/shell/test.mojom.h" #include "testing/gtest/include/gtest/gtest.h" namespace mojo { |