| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//testing/test.gni") | 5 import("//testing/test.gni") |
| 6 | 6 |
| 7 group("common") { | 7 group("common") { |
| 8 public_deps = [ | 8 public_deps = [ |
| 9 ":common_base", | 9 ":common_base", |
| 10 ":url_type_converters", | 10 ":url_type_converters", |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 "weak_interface_ptr_set.h", | 29 "weak_interface_ptr_set.h", |
| 30 ] | 30 ] |
| 31 | 31 |
| 32 defines = [ "MOJO_COMMON_IMPLEMENTATION" ] | 32 defines = [ "MOJO_COMMON_IMPLEMENTATION" ] |
| 33 | 33 |
| 34 deps = [ | 34 deps = [ |
| 35 "//base", | 35 "//base", |
| 36 "//base/third_party/dynamic_annotations", | 36 "//base/third_party/dynamic_annotations", |
| 37 "//mojo/environment:chromium", | 37 "//mojo/environment:chromium", |
| 38 "//mojo/message_pump", | 38 "//mojo/message_pump", |
| 39 "//third_party/mojo/src/mojo/public/c/system:for_component", | 39 "//mojo/public/c/system:for_component", |
| 40 "//third_party/mojo/src/mojo/public/cpp/bindings", | 40 "//mojo/public/cpp/bindings", |
| 41 "//third_party/mojo/src/mojo/public/cpp/environment", | 41 "//mojo/public/cpp/environment", |
| 42 "//third_party/mojo/src/mojo/public/cpp/system", | 42 "//mojo/public/cpp/system", |
| 43 ] | 43 ] |
| 44 } | 44 } |
| 45 | 45 |
| 46 # GYP version: mojo/mojo_base.gyp:mojo_url_type_converters | 46 # GYP version: mojo/mojo_base.gyp:mojo_url_type_converters |
| 47 source_set("url_type_converters") { | 47 source_set("url_type_converters") { |
| 48 sources = [ | 48 sources = [ |
| 49 "url_type_converters.cc", | 49 "url_type_converters.cc", |
| 50 "url_type_converters.h", | 50 "url_type_converters.h", |
| 51 ] | 51 ] |
| 52 | 52 |
| 53 include_dirs = [ "//third_party/mojo/src/" ] | |
| 54 | |
| 55 deps = [ | 53 deps = [ |
| 56 ":common_base", | 54 ":common_base", |
| 57 "//base", | 55 "//base", |
| 58 "//base/third_party/dynamic_annotations", | 56 "//base/third_party/dynamic_annotations", |
| 59 "//third_party/mojo/src/mojo/public/cpp/bindings", | 57 "//mojo/public/cpp/bindings", |
| 60 "//url", | 58 "//url", |
| 61 ] | 59 ] |
| 62 } | 60 } |
| 63 | 61 |
| 64 # TODO(GYP): Delete this after we've converted everything to GN. | 62 # TODO(GYP): Delete this after we've converted everything to GN. |
| 65 # The _run targets exist only for compatibility w/ GYP. | 63 # The _run targets exist only for compatibility w/ GYP. |
| 66 group("mojo_common_unittests_run") { | 64 group("mojo_common_unittests_run") { |
| 67 testonly = true | 65 testonly = true |
| 68 deps = [ | 66 deps = [ |
| 69 ":mojo_common_unittests", | 67 ":mojo_common_unittests", |
| 70 ] | 68 ] |
| 71 } | 69 } |
| 72 | 70 |
| 73 # GYP version: mojo/mojo_base.gyp:mojo_common_unittests | 71 # GYP version: mojo/mojo_base.gyp:mojo_common_unittests |
| 74 test("mojo_common_unittests") { | 72 test("mojo_common_unittests") { |
| 75 deps = [ | 73 deps = [ |
| 76 ":common", | 74 ":common", |
| 77 "//base", | 75 "//base", |
| 78 "//base:message_loop_tests", | 76 "//base:message_loop_tests", |
| 79 "//base/test:test_support", | 77 "//base/test:test_support", |
| 80 "//mojo/environment:chromium", | 78 "//mojo/environment:chromium", |
| 81 "//mojo/message_pump", | 79 "//mojo/message_pump", |
| 82 "//testing/gtest", | 80 "//testing/gtest", |
| 83 "//third_party/mojo/src/mojo/edk/test:run_all_unittests", | 81 "//third_party/mojo/src/mojo/edk/test:run_all_unittests", |
| 84 "//third_party/mojo/src/mojo/edk/test:test_support", | 82 "//third_party/mojo/src/mojo/edk/test:test_support", |
| 85 "//third_party/mojo/src/mojo/public/cpp/bindings", | 83 "//mojo/public/cpp/bindings", |
| 86 "//third_party/mojo/src/mojo/public/cpp/test_support:test_utils", | 84 "//mojo/public/cpp/test_support:test_utils", |
| 87 "//url", | 85 "//url", |
| 88 ] | 86 ] |
| 89 | 87 |
| 90 sources = [ | 88 sources = [ |
| 91 # The message_pump tests are so small and some what related to this code | 89 # The message_pump tests are so small and some what related to this code |
| 92 # that we put them here. | 90 # that we put them here. |
| 93 "../message_pump/handle_watcher_unittest.cc", | 91 "../message_pump/handle_watcher_unittest.cc", |
| 94 "../message_pump/message_pump_mojo_unittest.cc", | 92 "../message_pump/message_pump_mojo_unittest.cc", |
| 95 "common_type_converters_unittest.cc", | 93 "common_type_converters_unittest.cc", |
| 96 ] | 94 ] |
| 97 } | 95 } |
| OLD | NEW |