Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(165)

Side by Side Diff: content/renderer/BUILD.gn

Issue 1404213004: Reland: Add webusb permission bubble mojom (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@webusb_permission_ui_1_refactor_permission_bubble_manager
Patch Set: updated webusb.gypi dependencies again Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/content_renderer.gypi ('k') | content/renderer/usb/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 10 matching lines...) Expand all
21 "//build/config/compiler:no_size_t_to_int_warning", 21 "//build/config/compiler:no_size_t_to_int_warning",
22 ] 22 ]
23 23
24 deps = [ 24 deps = [
25 # TODO(GYP) bug 376846 remove this. This should be inherited from //net but 25 # TODO(GYP) bug 376846 remove this. This should be inherited from //net but
26 # those don't cross component boundaries. 26 # those don't cross component boundaries.
27 "//crypto:platform", 27 "//crypto:platform",
28 "//base/allocator", 28 "//base/allocator",
29 "//cc", 29 "//cc",
30 "//cc/blink", 30 "//cc/blink",
31 "//components/scheduler:scheduler",
31 "//components/url_formatter", 32 "//components/url_formatter",
32 "//components/scheduler:scheduler", 33 "//components/webusb",
33 "//content:resources", 34 "//content:resources",
34 "//content/common:mojo_bindings", 35 "//content/common:mojo_bindings",
35 "//content/public/child:child_sources", 36 "//content/public/child:child_sources",
36 "//content/public/common:common_sources", 37 "//content/public/common:common_sources",
37 "//content/public/common:mojo_bindings", 38 "//content/public/common:mojo_bindings",
38 "//device/battery:mojo_bindings", 39 "//device/battery:mojo_bindings",
39 "//device/vibration:mojo_bindings", 40 "//device/vibration:mojo_bindings",
40 "//gin", 41 "//gin",
41 "//gpu", 42 "//gpu",
42 "//gpu/command_buffer/client:gles2_interface", 43 "//gpu/command_buffer/client:gles2_interface",
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 ] 97 ]
97 98
98 # Add back the Linux file which Android shares. 99 # Add back the Linux file which Android shares.
99 set_sources_assignment_filter([]) 100 set_sources_assignment_filter([])
100 sources += [ "render_view_linux.cc" ] 101 sources += [ "render_view_linux.cc" ]
101 102
102 deps += [ 103 deps += [
103 "//third_party/android_tools:cpu_features", 104 "//third_party/android_tools:cpu_features",
104 "//third_party/libphonenumber", 105 "//third_party/libphonenumber",
105 ] 106 ]
107
108 deps -= [ "//components/webusb" ]
106 } else { 109 } else {
107 sources -= [ 110 sources -= [
108 "java/gin_java_bridge_dispatcher.cc", 111 "java/gin_java_bridge_dispatcher.cc",
109 "java/gin_java_bridge_dispatcher.h", 112 "java/gin_java_bridge_dispatcher.h",
110 "java/gin_java_bridge_object.cc", 113 "java/gin_java_bridge_object.cc",
111 "java/gin_java_bridge_object.h", 114 "java/gin_java_bridge_object.h",
112 "java/gin_java_bridge_value_converter.cc", 115 "java/gin_java_bridge_value_converter.cc",
113 "java/gin_java_bridge_value_converter.h", 116 "java/gin_java_bridge_value_converter.h",
114 "java/gin_java_function_invocation_helper.cc", 117 "java/gin_java_function_invocation_helper.cc",
115 "java/gin_java_function_invocation_helper.h", 118 "java/gin_java_function_invocation_helper.h",
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 212
210 if (enable_webvr) { 213 if (enable_webvr) {
211 sources += [ 214 sources += [
212 "vr/vr_dispatcher.cc", 215 "vr/vr_dispatcher.cc",
213 "vr/vr_dispatcher.h", 216 "vr/vr_dispatcher.h",
214 "vr/vr_type_converters.cc", 217 "vr/vr_type_converters.cc",
215 "vr/vr_type_converters.h", 218 "vr/vr_type_converters.h",
216 ] 219 ]
217 } 220 }
218 } 221 }
OLDNEW
« no previous file with comments | « content/content_renderer.gypi ('k') | content/renderer/usb/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698