Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(155)

Side by Side Diff: mojo/common/BUILD.gn

Issue 1554443003: Stop linking in the old Mojo EDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge and fix new flaky test Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « mojo/android/javatests/init_library.cc ('k') | mojo/converters/surfaces/tests/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 ] 46 ]
47 } 47 }
48 48
49 # GYP version: mojo/mojo_base.gyp:mojo_url_type_converters 49 # GYP version: mojo/mojo_base.gyp:mojo_url_type_converters
50 source_set("url_type_converters") { 50 source_set("url_type_converters") {
51 sources = [ 51 sources = [
52 "url_type_converters.cc", 52 "url_type_converters.cc",
53 "url_type_converters.h", 53 "url_type_converters.h",
54 ] 54 ]
55 55
56 include_dirs = [ "//third_party/mojo/src/" ]
57
58 deps = [ 56 deps = [
59 ":common_base", 57 ":common_base",
60 "//base", 58 "//base",
61 "//base/third_party/dynamic_annotations", 59 "//base/third_party/dynamic_annotations",
62 "//mojo/public/cpp/bindings", 60 "//mojo/public/cpp/bindings",
63 "//url", 61 "//url",
64 ] 62 ]
65 } 63 }
66 64
67 # TODO(GYP): Delete this after we've converted everything to GN. 65 # TODO(GYP): Delete this after we've converted everything to GN.
68 # The _run targets exist only for compatibility w/ GYP. 66 # The _run targets exist only for compatibility w/ GYP.
69 group("mojo_common_unittests_run") { 67 group("mojo_common_unittests_run") {
70 testonly = true 68 testonly = true
71 deps = [ 69 deps = [
72 ":mojo_common_unittests", 70 ":mojo_common_unittests",
73 ] 71 ]
74 } 72 }
75 73
76 # GYP version: mojo/mojo_base.gyp:mojo_common_unittests 74 # GYP version: mojo/mojo_base.gyp:mojo_common_unittests
77 test("mojo_common_unittests") { 75 test("mojo_common_unittests") {
78 deps = [ 76 deps = [
79 ":common", 77 ":common",
80 "//base", 78 "//base",
81 "//base:message_loop_tests", 79 "//base:message_loop_tests",
82 "//base/test:test_support", 80 "//base/test:test_support",
81 "//mojo/edk/test:run_all_unittests",
82 "//mojo/edk/test:test_support",
83 "//mojo/environment:chromium", 83 "//mojo/environment:chromium",
84 "//mojo/message_pump", 84 "//mojo/message_pump",
85 "//mojo/public/cpp/bindings", 85 "//mojo/public/cpp/bindings",
86 "//mojo/public/cpp/test_support:test_utils", 86 "//mojo/public/cpp/test_support:test_utils",
87 "//testing/gtest", 87 "//testing/gtest",
88 "//third_party/mojo/src/mojo/edk/test:run_all_unittests",
89 "//third_party/mojo/src/mojo/edk/test:test_support",
90 "//url", 88 "//url",
91 ] 89 ]
92 90
93 sources = [ 91 sources = [
94 # The message_pump tests are so small and some what related to this code 92 # The message_pump tests are so small and some what related to this code
95 # that we put them here. 93 # that we put them here.
96 "../message_pump/handle_watcher_unittest.cc", 94 "../message_pump/handle_watcher_unittest.cc",
97 "../message_pump/message_pump_mojo_unittest.cc", 95 "../message_pump/message_pump_mojo_unittest.cc",
98 "common_type_converters_unittest.cc", 96 "common_type_converters_unittest.cc",
99 ] 97 ]
100 98
101 if (is_linux && !is_component_build) { 99 if (is_linux && !is_component_build) {
102 # This tests dynamically loads libmojo_test_support even in non-component 100 # This tests dynamically loads libmojo_test_support even in non-component
103 # builds. 101 # builds.
104 configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] 102 configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
105 } 103 }
106 } 104 }
107 105
108 test("mojo_common_perftests") { 106 test("mojo_common_perftests") {
109 deps = [ 107 deps = [
110 ":common", 108 ":common",
111 "//base", 109 "//base",
110 "//mojo/edk/test:run_all_perftests",
112 "//mojo/environment:chromium", 111 "//mojo/environment:chromium",
113 "//mojo/message_pump", 112 "//mojo/message_pump",
114 "//mojo/public/cpp/test_support:test_utils", 113 "//mojo/public/cpp/test_support:test_utils",
115 "//testing/gtest", 114 "//testing/gtest",
116 "//third_party/mojo/src/mojo/edk/test:run_all_perftests",
117 ] 115 ]
118 116
119 sources = [ 117 sources = [
120 "../message_pump/handle_watcher_perftest.cc", 118 "../message_pump/handle_watcher_perftest.cc",
121 ] 119 ]
122 120
123 if (is_linux && !is_component_build) { 121 if (is_linux && !is_component_build) {
124 # This test dynamically loads libmojo_test_support even in non-component 122 # This test dynamically loads libmojo_test_support even in non-component
125 # builds. 123 # builds.
126 configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] 124 configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
127 } 125 }
128 } 126 }
OLDNEW
« no previous file with comments | « mojo/android/javatests/init_library.cc ('k') | mojo/converters/surfaces/tests/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698