Chromium Code Reviews| Index: blimp/client/BUILD.gn |
| diff --git a/blimp/client/BUILD.gn b/blimp/client/BUILD.gn |
| index d2ddc2b1414c7a1d8fca8167ed7d7ac0dd91009a..465adb7967cb4ed71c7971d7b07421fee7fbd4ce 100644 |
| --- a/blimp/client/BUILD.gn |
| +++ b/blimp/client/BUILD.gn |
| @@ -27,6 +27,7 @@ source_set("blimp_client") { |
| defines = [ "BLIMP_CLIENT_IMPLEMENTATION=1" ] |
| public_deps = [ |
| + "//components/safe_json", |
|
boliu
2016/03/03 00:25:11
This transitively pulls in //content/public/browse
|
| "//ui/events", |
| ] |
| @@ -49,12 +50,6 @@ source_set("blimp_client_unit_tests") { |
| sources = [] |
| - # TODO(dtrainor): Fix the test harness to allow this to run on Android. |
| - # See crbug.com/588240. |
| - if (is_linux) { |
| - sources += [ "session/assignment_source_unittest.cc" ] |
| - } |
| - |
| deps = [ |
| ":blimp_client", |
| "//base", |
| @@ -63,6 +58,19 @@ source_set("blimp_client_unit_tests") { |
| "//testing/gmock", |
| "//testing/gtest", |
| ] |
| + |
| + data = [] |
| + |
| + # TODO(dtrainor): Fix the test harness to allow this to run on Android. |
| + # See crbug.com/588240. |
| + if (is_linux) { |
| + sources += [ "session/assignment_source_unittest.cc" ] |
| + deps += [ |
| + "//components/safe_json:test_support", |
| + "//net:test_support", |
| + ] |
| + data += [ "session/test_selfsigned_cert.pem" ] |
| + } |
| } |
| source_set("app_unit_tests") { |
| @@ -342,6 +350,7 @@ if (is_android) { |
| "//base", |
| "//blimp/common/proto", |
| "//blimp/net:blimp_net", |
| + "//components/safe_json/android:safe_json_jni_headers", |
| "//skia", |
| "//ui/gfx/geometry", |
| "//ui/gl", |
| @@ -375,6 +384,7 @@ if (is_android) { |
| ":blimp_java", |
| ":blimp_java_resources", |
| "//base:base_java", |
| + "//components/safe_json/android:safe_json_java", |
| "//net/android:net_java", |
| google_play_services_resources, |
| ] |