| 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 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 public_deps = [ | 154 public_deps = [ |
| 155 "//blimp/common/proto", | 155 "//blimp/common/proto", |
| 156 ] | 156 ] |
| 157 } | 157 } |
| 158 | 158 |
| 159 source_set("feature_unit_tests") { | 159 source_set("feature_unit_tests") { |
| 160 testonly = true | 160 testonly = true |
| 161 | 161 |
| 162 sources = [ | 162 sources = [ |
| 163 "feature/compositor/blimp_compositor_manager_unittest.cc", | 163 "feature/compositor/blimp_compositor_manager_unittest.cc", |
| 164 "feature/navigation_feature_unittest.cc", | 164 |
| 165 # "feature/navigation_feature_unittest.cc", |
| 165 "feature/render_widget_feature_unittest.cc", | 166 "feature/render_widget_feature_unittest.cc", |
| 166 "feature/tab_control_feature_unittest.cc", | 167 "feature/tab_control_feature_unittest.cc", |
| 167 ] | 168 ] |
| 168 | 169 |
| 169 deps = [ | 170 deps = [ |
| 170 ":feature", | 171 ":feature", |
| 171 "//base", | 172 "//base", |
| 172 "//base/test:run_all_unittests", | 173 "//base/test:run_all_unittests", |
| 173 "//base/test:test_support", | 174 "//base/test:test_support", |
| 174 "//blimp/common", | 175 "//blimp/common", |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 435 apk_name = "BlimpTest" | 436 apk_name = "BlimpTest" |
| 436 apk_under_test = ":blimp_apk" | 437 apk_under_test = ":blimp_apk" |
| 437 android_manifest = blimp_test_apk_manifest | 438 android_manifest = blimp_test_apk_manifest |
| 438 deps = [ | 439 deps = [ |
| 439 ":blimp_test_apk_manifest", | 440 ":blimp_test_apk_manifest", |
| 440 ":blimp_test_java", | 441 ":blimp_test_java", |
| 441 google_play_services_resources, | 442 google_play_services_resources, |
| 442 ] | 443 ] |
| 443 } | 444 } |
| 444 } | 445 } |
| OLD | NEW |