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") { | |
8 deps = [ | |
9 ":common_base", | |
10 ":url_type_converters", | |
11 ] | |
12 } | |
13 | |
7 # GYP version: mojo/mojo_base.gyp:mojo_common_lib | 14 # GYP version: mojo/mojo_base.gyp:mojo_common_lib |
8 component("common") { | 15 component("common_base") { |
9 output_name = "mojo_common_lib" | 16 output_name = "mojo_common_lib" |
10 | 17 |
11 sources = [ | 18 sources = [ |
12 "common_type_converters.cc", | 19 "common_type_converters.cc", |
13 "common_type_converters.h", | 20 "common_type_converters.h", |
14 "data_pipe_utils.cc", | 21 "data_pipe_utils.cc", |
15 "data_pipe_utils.h", | 22 "data_pipe_utils.h", |
16 "handle_watcher.cc", | 23 "handle_watcher.cc", |
17 "handle_watcher.h", | 24 "handle_watcher.h", |
18 "message_pump_mojo.cc", | 25 "message_pump_mojo.cc", |
19 "message_pump_mojo.h", | 26 "message_pump_mojo.h", |
20 "message_pump_mojo_handler.h", | 27 "message_pump_mojo_handler.h", |
21 "time_helper.cc", | 28 "time_helper.cc", |
22 "time_helper.h", | 29 "time_helper.h", |
23 ] | 30 ] |
24 | 31 |
25 defines = [ "MOJO_COMMON_IMPLEMENTATION" ] | 32 defines = [ "MOJO_COMMON_IMPLEMENTATION" ] |
26 | 33 |
27 deps = [ | 34 deps = [ |
28 "//base", | 35 "//base", |
29 "//base/third_party/dynamic_annotations", | 36 "//base/third_party/dynamic_annotations", |
30 "//third_party/mojo/src/mojo/public/c/system:for_component", | 37 "//third_party/mojo/src/mojo/public/c/system:for_component", |
38 ] | |
39 } | |
40 | |
41 static_library("url_type_converters") { | |
jamesr
2015/03/04 04:14:44
source_set
static_library is extremely rarely wha
Hajime Morrita
2015/03/05 18:29:41
Done.
| |
42 sources = [ | |
43 "url_type_converters.cc", | |
44 "url_type_converters.h", | |
45 ] | |
46 | |
47 deps = [ | |
48 "//base", | |
49 "//base/third_party/dynamic_annotations", | |
50 "//third_party/mojo/src/mojo/public/c/system:for_component", | |
jamesr
2015/03/04 04:14:44
this is not a component so this is the wrong targe
Hajime Morrita
2015/03/05 18:29:41
Done.
| |
31 "//url", | 51 "//url", |
32 ] | 52 ] |
33 } | 53 } |
34 | 54 |
35 # GYP version: mojo/mojo_base.gyp:mojo_common_unittests | 55 # GYP version: mojo/mojo_base.gyp:mojo_common_unittests |
36 test("mojo_common_unittests") { | 56 test("mojo_common_unittests") { |
37 deps = [ | 57 deps = [ |
38 ":common", | 58 ":common", |
39 "//base", | 59 "//base", |
40 "//base:message_loop_tests", | 60 "//base:message_loop_tests", |
41 "//mojo/environment:chromium", | 61 "//mojo/environment:chromium", |
42 "//testing/gtest", | 62 "//testing/gtest", |
43 "//third_party/mojo/src/mojo/edk/test:run_all_unittests", | 63 "//third_party/mojo/src/mojo/edk/test:run_all_unittests", |
44 "//third_party/mojo/src/mojo/edk/test:test_support", | 64 "//third_party/mojo/src/mojo/edk/test:test_support", |
45 "//third_party/mojo/src/mojo/public/cpp/bindings", | 65 "//third_party/mojo/src/mojo/public/cpp/bindings", |
46 "//third_party/mojo/src/mojo/public/cpp/test_support:test_utils", | 66 "//third_party/mojo/src/mojo/public/cpp/test_support:test_utils", |
47 "//url", | |
jamesr
2015/03/04 04:14:44
the test still appears to test url conversions - w
Hajime Morrita
2015/03/05 18:29:41
Got it back and gn check passes now.
| |
48 ] | 67 ] |
49 | 68 |
50 sources = [ | 69 sources = [ |
51 "common_type_converters_unittest.cc", | 70 "common_type_converters_unittest.cc", |
52 "handle_watcher_unittest.cc", | 71 "handle_watcher_unittest.cc", |
53 "message_pump_mojo_unittest.cc", | 72 "message_pump_mojo_unittest.cc", |
54 ] | 73 ] |
55 } | 74 } |
OLD | NEW |