| 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 } |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 "//testing/gtest", | 92 "//testing/gtest", |
| 93 ] | 93 ] |
| 94 | 94 |
| 95 data = [] | 95 data = [] |
| 96 | 96 |
| 97 # TODO(dtrainor): Fix the test harness to allow this to run on Android. | 97 # TODO(dtrainor): Fix the test harness to allow this to run on Android. |
| 98 # See crbug.com/588240. | 98 # See crbug.com/588240. |
| 99 if (is_linux) { | 99 if (is_linux) { |
| 100 sources += [ "session/assignment_source_unittest.cc" ] | 100 sources += [ "session/assignment_source_unittest.cc" ] |
| 101 deps += [ | 101 deps += [ |
| 102 "//blimp/common", |
| 103 "//blimp/common:test_support", |
| 102 "//components/safe_json:test_support", | 104 "//components/safe_json:test_support", |
| 103 "//net:test_support", | 105 "//net:test_support", |
| 104 ] | 106 ] |
| 105 data += [ "session/test_selfsigned_cert.pem" ] | 107 data += [ "session/test_selfsigned_cert.pem" ] |
| 106 } | 108 } |
| 107 } | 109 } |
| 108 | 110 |
| 109 source_set("app_unit_tests") { | 111 source_set("app_unit_tests") { |
| 110 testonly = true | 112 testonly = true |
| 111 | 113 |
| (...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 509 apk_name = "BlimpTest" | 511 apk_name = "BlimpTest" |
| 510 apk_under_test = ":blimp_apk" | 512 apk_under_test = ":blimp_apk" |
| 511 android_manifest = blimp_test_apk_manifest | 513 android_manifest = blimp_test_apk_manifest |
| 512 deps = [ | 514 deps = [ |
| 513 ":blimp_test_apk_manifest", | 515 ":blimp_test_apk_manifest", |
| 514 ":blimp_test_java", | 516 ":blimp_test_java", |
| 515 google_play_services_resources, | 517 google_play_services_resources, |
| 516 ] | 518 ] |
| 517 } | 519 } |
| 518 } | 520 } |
| OLD | NEW |