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", | 20 "blimp_client_export.h", |
21 "session/assignment_source.cc", | 21 "session/assignment_source.cc", |
22 "session/assignment_source.h", | 22 "session/assignment_source.h", |
23 "session/blimp_client_session.cc", | 23 "session/blimp_client_session.cc", |
24 "session/blimp_client_session.h", | 24 "session/blimp_client_session.h", |
25 ] | 25 ] |
26 | 26 |
27 defines = [ "BLIMP_CLIENT_IMPLEMENTATION=1" ] | 27 defines = [ "BLIMP_CLIENT_IMPLEMENTATION=1" ] |
28 | 28 |
29 public_deps = [ | 29 public_deps = [ |
30 "//components/safe_json", | |
30 "//ui/events", | 31 "//ui/events", |
31 ] | 32 ] |
32 | 33 |
33 deps = [ | 34 deps = [ |
34 ":feature", | 35 ":feature", |
35 "//base", | 36 "//base", |
36 "//blimp/common/proto", | 37 "//blimp/common/proto", |
37 "//blimp/net:blimp_net", | 38 "//blimp/net:blimp_net", |
38 "//cc", | 39 "//cc", |
39 "//gpu/skia_bindings", | 40 "//gpu/skia_bindings", |
40 "//net", | 41 "//net", |
41 "//third_party/libwebp", | 42 "//third_party/libwebp", |
42 "//ui/gfx/geometry", | 43 "//ui/gfx/geometry", |
43 "//url:url", | 44 "//url:url", |
44 ] | 45 ] |
45 } | 46 } |
46 | 47 |
47 source_set("blimp_client_unit_tests") { | 48 source_set("blimp_client_unit_tests") { |
48 testonly = true | 49 testonly = true |
49 | 50 |
50 sources = [] | 51 sources = [] |
51 | 52 |
52 # TODO(dtrainor): Fix the test harness to allow this to run on Android. | |
53 # See crbug.com/588240. | |
54 if (is_linux) { | |
55 sources += [ "session/assignment_source_unittest.cc" ] | |
56 } | |
57 | |
58 deps = [ | 53 deps = [ |
59 ":blimp_client", | 54 ":blimp_client", |
60 "//base", | 55 "//base", |
61 "//base/test:run_all_unittests", | 56 "//base/test:run_all_unittests", |
62 "//base/test:test_support", | 57 "//base/test:test_support", |
63 "//testing/gmock", | 58 "//testing/gmock", |
64 "//testing/gtest", | 59 "//testing/gtest", |
65 ] | 60 ] |
61 | |
62 data = [] | |
63 | |
64 # TODO(dtrainor): Fix the test harness to allow this to run on Android. | |
65 # See crbug.com/588240. | |
66 if (is_linux) { | |
67 sources += [ "session/assignment_source_unittest.cc" ] | |
68 deps += [ | |
69 "//components/safe_json:test_support", | |
70 "//net:test_support", | |
71 ] | |
72 data += [ "session/test_selfsigned_cert.pem" ] | |
Wez
2016/03/02 02:26:44
Is this sufficient to get the correct test-isolate
Kevin M
2016/03/02 18:05:33
I *think* so? remoting_unittests uses "data" for i
| |
73 } | |
66 } | 74 } |
67 | 75 |
68 source_set("app_unit_tests") { | 76 source_set("app_unit_tests") { |
69 testonly = true | 77 testonly = true |
70 | 78 |
71 sources = [ | 79 sources = [ |
72 "app/blimp_discardable_memory_allocator_unittest.cc", | 80 "app/blimp_discardable_memory_allocator_unittest.cc", |
73 ] | 81 ] |
74 | 82 |
75 deps = [ | 83 deps = [ |
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
334 } | 342 } |
335 | 343 |
336 shared_library("blimp_client_android") { | 344 shared_library("blimp_client_android") { |
337 deps = [ | 345 deps = [ |
338 ":blimp_client", | 346 ":blimp_client", |
339 ":feature", | 347 ":feature", |
340 ":jni_headers", | 348 ":jni_headers", |
341 "//base", | 349 "//base", |
342 "//blimp/common/proto", | 350 "//blimp/common/proto", |
343 "//blimp/net:blimp_net", | 351 "//blimp/net:blimp_net", |
352 "//components/safe_json/android:safe_json_jni_headers", | |
344 "//skia", | 353 "//skia", |
345 "//ui/gfx/geometry", | 354 "//ui/gfx/geometry", |
346 "//ui/gl", | 355 "//ui/gl", |
347 "//url:url", | 356 "//url:url", |
348 ] | 357 ] |
349 | 358 |
350 sources = [ | 359 sources = [ |
351 "app/android/blimp_client_session_android.cc", | 360 "app/android/blimp_client_session_android.cc", |
352 "app/android/blimp_client_session_android.h", | 361 "app/android/blimp_client_session_android.h", |
353 "app/android/blimp_compositor_manager_android.cc", | 362 "app/android/blimp_compositor_manager_android.cc", |
(...skipping 13 matching lines...) Expand all Loading... | |
367 libs = [ "android" ] | 376 libs = [ "android" ] |
368 } | 377 } |
369 | 378 |
370 android_apk("blimp_apk") { | 379 android_apk("blimp_apk") { |
371 deps = [ | 380 deps = [ |
372 ":blimp_apk_manifest", | 381 ":blimp_apk_manifest", |
373 ":blimp_client_android", | 382 ":blimp_client_android", |
374 ":blimp_java", | 383 ":blimp_java", |
375 ":blimp_java_resources", | 384 ":blimp_java_resources", |
376 "//base:base_java", | 385 "//base:base_java", |
386 "//components/safe_json/android:safe_json_java", | |
377 "//net/android:net_java", | 387 "//net/android:net_java", |
378 google_play_services_resources, | 388 google_play_services_resources, |
379 ] | 389 ] |
380 apk_name = "Blimp" | 390 apk_name = "Blimp" |
381 android_manifest = blimp_apk_manifest | 391 android_manifest = blimp_apk_manifest |
382 native_libs = [ "libblimp_client_android.so" ] | 392 native_libs = [ "libblimp_client_android.so" ] |
383 } | 393 } |
384 | 394 |
385 instrumentation_test_apk("blimp_test_apk") { | 395 instrumentation_test_apk("blimp_test_apk") { |
386 apk_name = "BlimpTest" | 396 apk_name = "BlimpTest" |
387 apk_under_test = ":blimp_apk" | 397 apk_under_test = ":blimp_apk" |
388 android_manifest = blimp_test_apk_manifest | 398 android_manifest = blimp_test_apk_manifest |
389 deps = [ | 399 deps = [ |
390 ":blimp_test_apk_manifest", | 400 ":blimp_test_apk_manifest", |
391 ":blimp_test_java", | 401 ":blimp_test_java", |
392 google_play_services_resources, | 402 google_play_services_resources, |
393 ] | 403 ] |
394 } | 404 } |
395 } | 405 } |
OLD | NEW |