Chromium Code Reviews| Index: mojo/edk/embedder/BUILD.gn |
| diff --git a/third_party/mojo/src/mojo/edk/embedder/BUILD.gn b/mojo/edk/embedder/BUILD.gn |
| similarity index 69% |
| copy from third_party/mojo/src/mojo/edk/embedder/BUILD.gn |
| copy to mojo/edk/embedder/BUILD.gn |
| index b3144f099b019335e2492064e5938b4bed036b81..9acc1028eeb67521246592519b81c3dadcc18791 100644 |
| --- a/third_party/mojo/src/mojo/edk/embedder/BUILD.gn |
| +++ b/mojo/edk/embedder/BUILD.gn |
| @@ -7,10 +7,12 @@ 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. |
| - mojo_edk_visibility = [ "mojo/edk/system" ] |
| + visibility = [ |
| + "//components/nacl:nacl", |
| + "//mojo/edk/system", |
|
brettw
2015/09/30 03:56:14
This refers to the exact target //mojo/edk/system:
|
| + ] |
| sources = [ |
| - "channel_info_forward.h", |
| "configuration.h", |
| "embedder.cc", |
| "embedder.h", |
| @@ -31,17 +33,15 @@ mojo_edk_source_set("embedder") { |
| "MOJO_SYSTEM_IMPLEMENTATION", |
| ] |
| - mojo_edk_configs = [ "mojo/edk/system:system_config" ] |
| + configs = [ "//mojo/edk/system:system_config" ] |
| public_deps = [ |
| ":delegates", |
| ":platform", |
| + "//third_party/mojo/src/mojo/public/cpp/system", |
| + "//third_party/mojo/src/mojo/public/platform/native:system_impl_private_api", |
| ] |
| - mojo_sdk_deps = [ "mojo/public/platform/native:system_impl_private_api" ] |
| - |
| - mojo_sdk_public_deps = [ "mojo/public/cpp/system" ] |
| - |
| deps = [ |
| "//base", |
| ] |
| @@ -50,9 +50,10 @@ mojo_edk_source_set("embedder") { |
| mojo_edk_source_set("platform") { |
| # This isn't really a standalone target; it must be linked into the |
| # mojo_system_impl component. |
| - visibility = [ ":embedder" ] |
| - |
| - mojo_edk_visibility = [ "mojo/edk/system" ] |
| + visibility = [ |
| + ":embedder", |
| + "//mojo/edk/system", |
| + ] |
| sources = [ |
| "platform_channel_pair.cc", |
| @@ -81,12 +82,15 @@ mojo_edk_source_set("platform") { |
| defines = [ "MOJO_SYSTEM_IMPL_IMPLEMENTATION" ] |
| - mojo_edk_configs = [ "mojo/edk/system:system_config" ] |
| + configs = [ "//mojo/edk/system:system_config" ] |
| - mojo_sdk_public_deps = [ "mojo/public/cpp/system" ] |
| + public_deps = [ |
| + "//third_party/mojo/src/mojo/public/cpp/system", |
| + ] |
| deps = [ |
| "//base", |
| + "//crypto", |
| ] |
| if (is_android) { |
| @@ -97,28 +101,30 @@ mojo_edk_source_set("platform") { |
| mojo_edk_source_set("delegates") { |
| # This isn't really a standalone target; it must be linked into the |
| # mojo_system_impl component. |
| - visibility = [ ":embedder" ] |
| - |
| - mojo_edk_visibility = [ "mojo/edk/system" ] |
| + visibility = [ |
| + ":embedder", |
| + "//mojo/edk/system", |
| + ] |
| sources = [ |
| - "master_process_delegate.h", |
| "process_delegate.h", |
| - "process_type.h", |
| - "slave_info.h", |
| - "slave_process_delegate.h", |
| ] |
| defines = [ "MOJO_SYSTEM_IMPL_IMPLEMENTATION" ] |
| - mojo_edk_configs = [ "mojo/edk/system:system_config" ] |
| + configs = [ "//mojo/edk/system:system_config" ] |
| - mojo_sdk_public_deps = [ "mojo/public/cpp/system" ] |
| + public_deps = [ |
| + "//third_party/mojo/src/mojo/public/cpp/system", |
| + ] |
| } |
| -mojo_edk_source_set("embedder_unittests") { |
| +# TODO(use_chrome_edk): remove "2" |
| +mojo_edk_source_set("embedder_unittests2") { |
| testonly = true |
| - mojo_edk_visibility = [ "mojo/edk/system:mojo_system_unittests" ] |
| + |
| + # TODO(use_chrome_edk): remove "2" |
| + visibility = [ "//mojo/edk/system:mojo_system_unittests2" ] |
| sources = [ |
| "embedder_unittest.cc", |
| @@ -129,12 +135,14 @@ mojo_edk_source_set("embedder_unittests") { |
| deps = [ |
| "//base", |
| "//base/test:test_support", |
| + "//mojo/edk/system", |
| + "//mojo/message_pump", |
| + |
| + # TODO(use_chrome_edk): temporary since the Mojo wrapper primitives are |
| + # declared in third party only for now. |
| + "//third_party/mojo/src/mojo/edk/system", |
| + "//mojo/edk/system:test_utils", |
| + "//mojo/edk/test:test_support", |
| "//testing/gtest", |
| ] |
| - |
| - mojo_edk_deps = [ |
| - "mojo/edk/test:test_support", |
| - "mojo/edk/system", |
| - "mojo/edk/system:test_utils", |
| - ] |
| } |