diff options
| -rw-r--r-- | components/nacl/BUILD.gn | 4 | ||||
| -rw-r--r-- | ipc/mojo/BUILD.gn | 1 | ||||
| -rw-r--r-- | mojo/edk/embedder/BUILD.gn | 5 | ||||
| -rw-r--r-- | mojo/edk/system/BUILD.gn | 8 | ||||
| -rw-r--r-- | mojo/edk/system/master_impl.h | 2 | ||||
| -rw-r--r-- | third_party/mojo/src/mojo/edk/system/BUILD.gn | 10 |
6 files changed, 18 insertions, 12 deletions
diff --git a/components/nacl/BUILD.gn b/components/nacl/BUILD.gn index 7b64fe0..1284792 100644 --- a/components/nacl/BUILD.gn +++ b/components/nacl/BUILD.gn @@ -39,6 +39,10 @@ if (enable_nacl) { "//ppapi/proxy:ipc", "//ppapi/shared_impl", "//third_party/mojo/src/mojo/edk/embedder", + # TODO(use_chrome_edk): so that EDK in third_party can choose the EDK in + # src/mojo if the command line flag is specified. It has to since we can + # only have one definition of the Mojo primitives. + "//mojo/edk/embedder", ] if (enable_nacl_untrusted) { diff --git a/ipc/mojo/BUILD.gn b/ipc/mojo/BUILD.gn index 9d40306..d801a7b 100644 --- a/ipc/mojo/BUILD.gn +++ b/ipc/mojo/BUILD.gn @@ -38,7 +38,6 @@ component("mojo") { "//base", "//base/third_party/dynamic_annotations", "//ipc", - "//mojo/edk/system", "//mojo/environment:chromium", "//third_party/mojo/src/mojo/edk/system", "//third_party/mojo/src/mojo/public/c/environment:environment", diff --git a/mojo/edk/embedder/BUILD.gn b/mojo/edk/embedder/BUILD.gn index c4b486d..cf0856c 100644 --- a/mojo/edk/embedder/BUILD.gn +++ b/mojo/edk/embedder/BUILD.gn @@ -7,7 +7,10 @@ import("../mojo_edk.gni") mojo_edk_source_set("embedder") { # This isn't really a standalone target; it must be linked into the # mojo_system_impl component. - visibility = [ "//mojo/edk/system" ] + visibility = [ + "//mojo/edk/system", + "//components/nacl:nacl", + ] sources = [ "configuration.h", diff --git a/mojo/edk/system/BUILD.gn b/mojo/edk/system/BUILD.gn index b2df53a..b81601b 100644 --- a/mojo/edk/system/BUILD.gn +++ b/mojo/edk/system/BUILD.gn @@ -55,8 +55,8 @@ static_library("system") { "handle_table.h", "mapping_table.cc", "mapping_table.h", - "master_impl.cc", - "master_impl.h", + #"master_impl.cc", + #"master_impl.h", "message_in_transit.cc", "message_in_transit.h", "message_in_transit_queue.cc", @@ -98,7 +98,7 @@ static_library("system") { deps = [ "//base", "//base/third_party/dynamic_annotations", - ":master", + #":master", ] if (is_win) { @@ -149,7 +149,7 @@ test("mojo_system_unittests2") { "core_unittest.cc", "data_pipe_unittest.cc", "dispatcher_unittest.cc", - "master_impl_unittest.cc", + #"master_impl_unittest.cc", "message_in_transit_queue_unittest.cc", "message_in_transit_test_utils.cc", diff --git a/mojo/edk/system/master_impl.h b/mojo/edk/system/master_impl.h index 7d5bd8c..621db13 100644 --- a/mojo/edk/system/master_impl.h +++ b/mojo/edk/system/master_impl.h @@ -18,7 +18,7 @@ namespace mojo { namespace edk { // An instance of this class exists in the maste process for each slave process. -class MOJO_SYSTEM_IMPL_EXPORT MasterImpl : public Master { +class MasterImpl : public Master { public: explicit MasterImpl(base::ProcessId slave_pid); ~MasterImpl() override; diff --git a/third_party/mojo/src/mojo/edk/system/BUILD.gn b/third_party/mojo/src/mojo/edk/system/BUILD.gn index f492910..ebe88a8 100644 --- a/third_party/mojo/src/mojo/edk/system/BUILD.gn +++ b/third_party/mojo/src/mojo/edk/system/BUILD.gn @@ -128,11 +128,6 @@ component("system") { "../embedder:platform", "../../public/c/system", "../../public/cpp/system", - ] - - deps = [ - "//base", - "//base/third_party/dynamic_annotations", # TODO(use_chrome_edk): so that EDK in third_party can choose the EDK in # src/mojo if the command line flag is specified. It has to since we can @@ -140,6 +135,11 @@ component("system") { "//mojo/edk/system", ] + deps = [ + "//base", + "//base/third_party/dynamic_annotations", + ] + allow_circular_includes_from = [ "../embedder" ] } |