OLD | NEW |
---|---|
1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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("//build/config/ui.gni") | 5 import("//build/config/ui.gni") |
6 | 6 |
7 if (is_android) { | 7 if (is_android) { |
8 import("//build/config/android/config.gni") | 8 import("//build/config/android/config.gni") |
9 import("//build/config/android/rules.gni") | 9 import("//build/config/android/rules.gni") |
10 } | 10 } |
11 | 11 |
12 source_set("blimp_client") { | 12 source_set("blimp_client") { |
13 sources = [ | 13 sources = [ |
14 "app/blimp_client_switches.cc", | 14 "app/blimp_client_switches.cc", |
15 "app/blimp_client_switches.h", | 15 "app/blimp_client_switches.h", |
16 "app/blimp_discardable_memory_allocator.cc", | 16 "app/blimp_discardable_memory_allocator.cc", |
17 "app/blimp_discardable_memory_allocator.h", | 17 "app/blimp_discardable_memory_allocator.h", |
18 "app/blimp_startup.cc", | 18 "app/blimp_startup.cc", |
19 "app/blimp_startup.h", | 19 "app/blimp_startup.h", |
20 "blimp_client_export.h", | |
21 "session/assignment_source.cc", | 20 "session/assignment_source.cc", |
22 "session/assignment_source.h", | 21 "session/assignment_source.h", |
23 "session/blimp_client_session.cc", | 22 "session/blimp_client_session.cc", |
24 "session/blimp_client_session.h", | 23 "session/blimp_client_session.h", |
25 ] | 24 ] |
26 | 25 |
27 defines = [ "BLIMP_CLIENT_IMPLEMENTATION=1" ] | |
28 | |
29 public_deps = [ | 26 public_deps = [ |
30 "//components/safe_json", | 27 "//components/safe_json", |
31 "//components/url_formatter", | 28 "//components/url_formatter", |
32 "//ui/events", | 29 "//ui/events", |
33 ] | 30 ] |
34 | 31 |
35 deps = [ | 32 deps = [ |
33 ":blimp_client_export", | |
36 ":feature", | 34 ":feature", |
37 "//base", | 35 "//base", |
36 "//blimp/common:blimp_common", | |
brettw
2016/04/27 22:40:36
As a followup, this should be renamed just "//blim
nyquist
2016/04/27 23:13:37
Wow. Thanks! I'll definitely clean this up in a fo
| |
38 "//blimp/common/proto", | 37 "//blimp/common/proto", |
39 "//blimp/net:blimp_net", | 38 "//blimp/net:blimp_net", |
40 "//cc", | 39 "//cc", |
41 "//gpu/command_buffer/client:gles2_implementation", | 40 "//gpu/command_buffer/client:gles2_implementation", |
42 "//gpu/skia_bindings", | 41 "//gpu/skia_bindings", |
43 "//net", | 42 "//net", |
44 "//third_party/libwebp", | 43 "//third_party/libwebp", |
45 "//ui/gfx/geometry", | 44 "//ui/gfx/geometry", |
45 "//ui/gl", | |
46 "//url:url", | 46 "//url:url", |
47 ] | 47 ] |
48 } | 48 } |
49 | 49 |
50 source_set("blimp_client_export") { | |
51 sources = [ | |
52 "blimp_client_export.h", | |
53 ] | |
54 defines = [ "BLIMP_CLIENT_IMPLEMENTATION=1" ] | |
brettw
2016/04/27 22:40:36
This define won't do anything since no sources are
nyquist
2016/04/27 23:13:37
Done.
| |
55 } | |
56 | |
50 source_set("blimp_client_unit_tests") { | 57 source_set("blimp_client_unit_tests") { |
51 testonly = true | 58 testonly = true |
52 | 59 |
53 sources = [] | 60 sources = [] |
54 | 61 |
55 deps = [ | 62 deps = [ |
56 ":blimp_client", | 63 ":blimp_client", |
57 "//base", | 64 "//base", |
58 "//base/test:run_all_unittests", | 65 "//base/test:run_all_unittests", |
59 "//base/test:test_support", | 66 "//base/test:test_support", |
67 "//blimp/common:blimp_common", | |
60 "//testing/gmock", | 68 "//testing/gmock", |
61 "//testing/gtest", | 69 "//testing/gtest", |
62 ] | 70 ] |
63 | 71 |
64 data = [] | 72 data = [] |
65 | 73 |
66 # TODO(dtrainor): Fix the test harness to allow this to run on Android. | 74 # TODO(dtrainor): Fix the test harness to allow this to run on Android. |
67 # See crbug.com/588240. | 75 # See crbug.com/588240. |
68 if (is_linux) { | 76 if (is_linux) { |
69 sources += [ "session/assignment_source_unittest.cc" ] | 77 sources += [ "session/assignment_source_unittest.cc" ] |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
118 "feature/navigation_feature.h", | 126 "feature/navigation_feature.h", |
119 "feature/render_widget_feature.cc", | 127 "feature/render_widget_feature.cc", |
120 "feature/render_widget_feature.h", | 128 "feature/render_widget_feature.h", |
121 "feature/settings_feature.cc", | 129 "feature/settings_feature.cc", |
122 "feature/settings_feature.h", | 130 "feature/settings_feature.h", |
123 "feature/tab_control_feature.cc", | 131 "feature/tab_control_feature.cc", |
124 "feature/tab_control_feature.h", | 132 "feature/tab_control_feature.h", |
125 ] | 133 ] |
126 | 134 |
127 deps = [ | 135 deps = [ |
136 ":blimp_client_export", | |
128 "//blimp/common:blimp_common", | 137 "//blimp/common:blimp_common", |
129 "//blimp/net:blimp_net", | 138 "//blimp/net:blimp_net", |
130 "//cc", | 139 "//cc", |
131 "//cc/proto", | 140 "//cc/proto", |
141 "//components/url_formatter:url_formatter", | |
brettw
2016/04/27 22:40:36
Just use "//components/url_formatter" (expands to
nyquist
2016/04/27 23:13:37
Done.
| |
132 "//gpu/command_buffer/client", | 142 "//gpu/command_buffer/client", |
133 "//gpu/command_buffer/client:gl_in_process_context", | 143 "//gpu/command_buffer/client:gl_in_process_context", |
144 "//gpu/command_buffer/client:gles2_c_lib", | |
145 "//gpu/command_buffer/client:gles2_implementation", | |
134 "//gpu/command_buffer/common:gles2_utils", | 146 "//gpu/command_buffer/common:gles2_utils", |
135 "//gpu/skia_bindings", | 147 "//gpu/skia_bindings", |
148 "//net", | |
136 "//skia", | 149 "//skia", |
150 "//third_party/WebKit/public:blink_headers", | |
137 "//ui/base/ime:text_input_types", | 151 "//ui/base/ime:text_input_types", |
152 "//ui/events:gesture_detection", | |
138 "//ui/events/blink", | 153 "//ui/events/blink", |
139 "//ui/events/gestures/blink", | 154 "//ui/events/gestures/blink", |
140 "//ui/gl", | 155 "//ui/gl", |
141 ] | 156 ] |
142 | 157 |
143 public_deps = [ | 158 public_deps = [ |
144 "//blimp/common/proto", | 159 "//blimp/common/proto", |
145 ] | 160 ] |
146 } | 161 } |
147 | 162 |
(...skipping 10 matching lines...) Expand all Loading... | |
158 deps = [ | 173 deps = [ |
159 ":feature", | 174 ":feature", |
160 "//base", | 175 "//base", |
161 "//base/test:run_all_unittests", | 176 "//base/test:run_all_unittests", |
162 "//base/test:test_support", | 177 "//base/test:test_support", |
163 "//blimp/common:blimp_common", | 178 "//blimp/common:blimp_common", |
164 "//blimp/common/proto", | 179 "//blimp/common/proto", |
165 "//blimp/net:blimp_net", | 180 "//blimp/net:blimp_net", |
166 "//blimp/net:test_support", | 181 "//blimp/net:test_support", |
167 "//cc/proto", | 182 "//cc/proto", |
183 "//net", | |
184 "//net:test_support", | |
168 "//skia", | 185 "//skia", |
169 "//testing/gmock", | 186 "//testing/gmock", |
170 "//testing/gtest", | 187 "//testing/gtest", |
188 "//ui/events:gesture_detection", | |
189 "//ui/gfx/geometry", | |
171 ] | 190 ] |
172 | 191 |
173 if (is_linux) { | 192 if (is_linux) { |
174 #TODO(khushalsagar): Run these tests for android. | 193 #TODO(khushalsagar): Run these tests for android. |
175 sources += [ "feature/compositor/blimp_compositor_unittest.cc" ] | 194 sources += [ "feature/compositor/blimp_compositor_unittest.cc" ] |
176 } | 195 } |
177 } | 196 } |
178 | 197 |
179 if (is_linux && !is_chromeos && use_x11) { | 198 if (is_linux && !is_chromeos && use_x11) { |
180 executable("blimp_shell") { | 199 executable("blimp_shell") { |
181 sources = [ | 200 sources = [ |
182 "app/linux/blimp_client_session_linux.cc", | 201 "app/linux/blimp_client_session_linux.cc", |
183 "app/linux/blimp_client_session_linux.h", | 202 "app/linux/blimp_client_session_linux.h", |
184 "app/linux/blimp_display_manager.cc", | 203 "app/linux/blimp_display_manager.cc", |
185 "app/linux/blimp_display_manager.h", | 204 "app/linux/blimp_display_manager.h", |
186 "app/linux/blimp_main.cc", | 205 "app/linux/blimp_main.cc", |
187 ] | 206 ] |
188 | 207 |
189 deps = [ | 208 deps = [ |
190 ":blimp_client", | 209 ":blimp_client", |
191 ":feature", | 210 ":feature", |
192 "//base", | 211 "//base", |
193 "//blimp/net:blimp_net", | 212 "//blimp/net:blimp_net", |
194 "//net", | 213 "//net", |
195 "//ui/events/platform/x11", | 214 "//ui/events/platform/x11", |
215 "//ui/platform_window", | |
196 "//ui/platform_window/x11", | 216 "//ui/platform_window/x11", |
197 ] | 217 ] |
198 | 218 |
199 public_configs = [ "//build/config/linux:x11" ] | 219 public_configs = [ "//build/config/linux:x11" ] |
200 public_deps = [ | 220 public_deps = [ |
201 "//ui/events/platform/x11", | 221 "//ui/events/platform/x11", |
202 ] | 222 ] |
203 } | 223 } |
204 } | 224 } |
205 | 225 |
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
355 "app/android/javatests/src/org/chromium/blimp/auth/RetryingTokenSourceTest .java", | 375 "app/android/javatests/src/org/chromium/blimp/auth/RetryingTokenSourceTest .java", |
356 ] | 376 ] |
357 } | 377 } |
358 | 378 |
359 shared_library("blimp_client_android") { | 379 shared_library("blimp_client_android") { |
360 deps = [ | 380 deps = [ |
361 ":blimp_client", | 381 ":blimp_client", |
362 ":feature", | 382 ":feature", |
363 ":jni_headers", | 383 ":jni_headers", |
364 "//base", | 384 "//base", |
385 "//blimp/common:blimp_common", | |
365 "//blimp/common/proto", | 386 "//blimp/common/proto", |
366 "//blimp/net:blimp_net", | 387 "//blimp/net:blimp_net", |
367 "//components/safe_json/android:safe_json_jni_headers", | 388 "//components/safe_json/android:safe_json_jni_headers", |
368 "//components/url_formatter", | 389 "//components/url_formatter", |
390 "//net", | |
369 "//skia", | 391 "//skia", |
370 "//ui/base/ime:text_input_types", | 392 "//ui/base/ime:text_input_types", |
371 "//ui/gfx/geometry", | 393 "//ui/gfx/geometry", |
372 "//ui/gl", | 394 "//ui/gl", |
373 "//url:url", | 395 "//url:url", |
374 ] | 396 ] |
375 | 397 |
376 sources = [ | 398 sources = [ |
377 "app/android/blimp_client_session_android.cc", | 399 "app/android/blimp_client_session_android.cc", |
378 "app/android/blimp_client_session_android.h", | 400 "app/android/blimp_client_session_android.h", |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
417 apk_name = "BlimpTest" | 439 apk_name = "BlimpTest" |
418 apk_under_test = ":blimp_apk" | 440 apk_under_test = ":blimp_apk" |
419 android_manifest = blimp_test_apk_manifest | 441 android_manifest = blimp_test_apk_manifest |
420 deps = [ | 442 deps = [ |
421 ":blimp_test_apk_manifest", | 443 ":blimp_test_apk_manifest", |
422 ":blimp_test_java", | 444 ":blimp_test_java", |
423 google_play_services_resources, | 445 google_play_services_resources, |
424 ] | 446 ] |
425 } | 447 } |
426 } | 448 } |
OLD | NEW |