Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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/features.gni") | 5 import("//build/config/features.gni") |
| 6 import("//build/config/ui.gni") | 6 import("//build/config/ui.gni") |
| 7 import("//content/renderer/renderer.gni") | 7 import("//content/renderer/renderer.gni") |
| 8 import("//media/media_options.gni") | 8 import("//media/media_options.gni") |
| 9 | 9 |
| 10 source_set("renderer") { | 10 source_set("renderer") { |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 95 "external_popup_menu.h", | 95 "external_popup_menu.h", |
| 96 ] | 96 ] |
| 97 | 97 |
| 98 # Add back the Linux file which Android shares. | 98 # Add back the Linux file which Android shares. |
| 99 set_sources_assignment_filter([]) | 99 set_sources_assignment_filter([]) |
| 100 sources += [ "render_view_linux.cc" ] | 100 sources += [ "render_view_linux.cc" ] |
| 101 | 101 |
| 102 deps += [ | 102 deps += [ |
| 103 "//third_party/android_tools:cpu_features", | 103 "//third_party/android_tools:cpu_features", |
| 104 "//third_party/libphonenumber", | 104 "//third_party/libphonenumber", |
| 105 "//third_party/libyuv", | |
|
no sievers
2015/10/16 22:12:23
This is not an android change, so why here?
Also i
emircan
2015/10/16 22:27:31
Initially android bots failed [0] and I looked for
| |
| 105 ] | 106 ] |
| 106 } else { | 107 } else { |
| 107 sources -= [ | 108 sources -= [ |
| 108 "java/gin_java_bridge_dispatcher.cc", | 109 "java/gin_java_bridge_dispatcher.cc", |
| 109 "java/gin_java_bridge_dispatcher.h", | 110 "java/gin_java_bridge_dispatcher.h", |
| 110 "java/gin_java_bridge_object.cc", | 111 "java/gin_java_bridge_object.cc", |
| 111 "java/gin_java_bridge_object.h", | 112 "java/gin_java_bridge_object.h", |
| 112 "java/gin_java_bridge_value_converter.cc", | 113 "java/gin_java_bridge_value_converter.cc", |
| 113 "java/gin_java_bridge_value_converter.h", | 114 "java/gin_java_bridge_value_converter.h", |
| 114 "java/gin_java_function_invocation_helper.cc", | 115 "java/gin_java_function_invocation_helper.cc", |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 209 | 210 |
| 210 if (enable_webvr) { | 211 if (enable_webvr) { |
| 211 sources += [ | 212 sources += [ |
| 212 "vr/vr_dispatcher.cc", | 213 "vr/vr_dispatcher.cc", |
| 213 "vr/vr_dispatcher.h", | 214 "vr/vr_dispatcher.h", |
| 214 "vr/vr_type_converters.cc", | 215 "vr/vr_type_converters.cc", |
| 215 "vr/vr_type_converters.h", | 216 "vr/vr_type_converters.h", |
| 216 ] | 217 ] |
| 217 } | 218 } |
| 218 } | 219 } |
| OLD | NEW |