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 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 195 "app/linux/blimp_display_manager.h", | 195 "app/linux/blimp_display_manager.h", |
| 196 "app/linux/blimp_main.cc", | 196 "app/linux/blimp_main.cc", |
| 197 ] | 197 ] |
| 198 | 198 |
| 199 deps = [ | 199 deps = [ |
| 200 ":client", | 200 ":client", |
| 201 ":feature", | 201 ":feature", |
| 202 "//base", | 202 "//base", |
| 203 "//blimp/net", | 203 "//blimp/net", |
| 204 "//net", | 204 "//net", |
| 205 "//third_party/WebKit/public:blink", | |
|
Khushal
2016/05/04 02:02:19
blimp/client should not need to depend on blink. I
scottmg
2016/05/04 17:02:57
safe_json may be another problem, but the link err
Khushal
2016/05/04 18:09:31
Sorry I missed this earlier. Thanks!
+nyquist@ to
| |
| 205 "//ui/events/platform/x11", | 206 "//ui/events/platform/x11", |
| 206 "//ui/platform_window", | 207 "//ui/platform_window", |
| 207 "//ui/platform_window/x11", | 208 "//ui/platform_window/x11", |
| 208 ] | 209 ] |
| 209 | 210 |
| 210 public_configs = [ "//build/config/linux:x11" ] | 211 public_configs = [ "//build/config/linux:x11" ] |
| 211 public_deps = [ | 212 public_deps = [ |
| 212 "//ui/events/platform/x11", | 213 "//ui/events/platform/x11", |
| 213 ] | 214 ] |
| 214 } | 215 } |
| (...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 430 apk_name = "BlimpTest" | 431 apk_name = "BlimpTest" |
| 431 apk_under_test = ":blimp_apk" | 432 apk_under_test = ":blimp_apk" |
| 432 android_manifest = blimp_test_apk_manifest | 433 android_manifest = blimp_test_apk_manifest |
| 433 deps = [ | 434 deps = [ |
| 434 ":blimp_test_apk_manifest", | 435 ":blimp_test_apk_manifest", |
| 435 ":blimp_test_java", | 436 ":blimp_test_java", |
| 436 google_play_services_resources, | 437 google_play_services_resources, |
| 437 ] | 438 ] |
| 438 } | 439 } |
| 439 } | 440 } |
| OLD | NEW |