Chromium Code Reviews| 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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 163 "//blimp/common/proto", | 163 "//blimp/common/proto", |
| 164 ] | 164 ] |
| 165 } | 165 } |
| 166 | 166 |
| 167 source_set("test_support") { | 167 source_set("test_support") { |
| 168 testonly = true | 168 testonly = true |
| 169 | 169 |
| 170 sources = [ | 170 sources = [ |
| 171 "feature/mock_ime_feature_delegate.cc", | 171 "feature/mock_ime_feature_delegate.cc", |
| 172 "feature/mock_ime_feature_delegate.h", | 172 "feature/mock_ime_feature_delegate.h", |
| 173 "feature/mock_navigation_feature.cc", | |
|
nyquist
2016/07/25 22:59:06
Could we move these two new files to //blimp/clien
| |
| 174 "feature/mock_navigation_feature.h", | |
| 173 "feature/mock_navigation_feature_delegate.cc", | 175 "feature/mock_navigation_feature_delegate.cc", |
| 174 "feature/mock_navigation_feature_delegate.h", | 176 "feature/mock_navigation_feature_delegate.h", |
| 175 "feature/mock_render_widget_feature_delegate.cc", | 177 "feature/mock_render_widget_feature_delegate.cc", |
| 176 "feature/mock_render_widget_feature_delegate.h", | 178 "feature/mock_render_widget_feature_delegate.h", |
| 177 "session/test_client_session.cc", | 179 "session/test_client_session.cc", |
| 178 "session/test_client_session.h", | 180 "session/test_client_session.h", |
| 179 ] | 181 ] |
| 180 | 182 |
| 181 deps = [ | 183 deps = [ |
| 182 ":session", | 184 ":session", |
| 183 "//skia", | 185 "//skia", |
| 186 "//url", | |
| 187 ] | |
| 188 | |
| 189 public_deps = [ | |
| 184 "//testing/gmock", | 190 "//testing/gmock", |
| 185 "//url", | |
| 186 ] | 191 ] |
| 187 } | 192 } |
| 188 | 193 |
| 189 source_set("compositor") { | 194 source_set("compositor") { |
| 190 sources = [ | 195 sources = [ |
| 191 "feature/compositor/blimp_client_picture_cache.cc", | 196 "feature/compositor/blimp_client_picture_cache.cc", |
| 192 "feature/compositor/blimp_client_picture_cache.h", | 197 "feature/compositor/blimp_client_picture_cache.h", |
| 193 "feature/compositor/blimp_compositor.cc", | 198 "feature/compositor/blimp_compositor.cc", |
| 194 "feature/compositor/blimp_compositor.h", | 199 "feature/compositor/blimp_compositor.h", |
| 195 "feature/compositor/blimp_compositor_manager.cc", | 200 "feature/compositor/blimp_compositor_manager.cc", |
| (...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 537 instrumentation_test_apk("blimp_test_apk") { | 542 instrumentation_test_apk("blimp_test_apk") { |
| 538 apk_name = "BlimpTest" | 543 apk_name = "BlimpTest" |
| 539 apk_under_test = ":blimp_apk" | 544 apk_under_test = ":blimp_apk" |
| 540 android_manifest = blimp_test_apk_manifest | 545 android_manifest = blimp_test_apk_manifest |
| 541 android_manifest_dep = ":blimp_test_apk_manifest" | 546 android_manifest_dep = ":blimp_test_apk_manifest" |
| 542 deps = [ | 547 deps = [ |
| 543 ":blimp_test_java", | 548 ":blimp_test_java", |
| 544 ] | 549 ] |
| 545 } | 550 } |
| 546 } | 551 } |
| OLD | NEW |