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

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

Issue 1293253002: Connect WebUSB client interface to the devices app (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix memory leak in WeakBindingSet Created 5 years, 4 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/public/test/render_view_test.cc ('k') | content/renderer/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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 "webscrollbarbehavior_impl_gtkoraura.cc", 74 "webscrollbarbehavior_impl_gtkoraura.cc",
75 "webscrollbarbehavior_impl_gtkoraura.h", 75 "webscrollbarbehavior_impl_gtkoraura.h",
76 ] 76 ]
77 sources += [ 77 sources += [
78 "external_popup_menu.cc", 78 "external_popup_menu.cc",
79 "external_popup_menu.h", 79 "external_popup_menu.h",
80 ] 80 ]
81 } 81 }
82 82
83 if (is_android) { 83 if (is_android) {
84 sources -= [ "media/audio_decoder.cc" ] 84 sources -= [
85 "media/audio_decoder.cc",
86 "usb/type_converters.cc",
87 "usb/type_converters.h",
88 "usb/web_usb_client_impl.cc",
89 "usb/web_usb_client_impl.h",
90 "usb/web_usb_device_impl.cc",
91 "usb/web_usb_device_impl.h",
92 ]
85 sources += [ 93 sources += [
86 "external_popup_menu.cc", 94 "external_popup_menu.cc",
87 "external_popup_menu.h", 95 "external_popup_menu.h",
88 ] 96 ]
89 97
90 # Add back the Linux file which Android shares. 98 # Add back the Linux file which Android shares.
91 set_sources_assignment_filter([]) 99 set_sources_assignment_filter([])
92 sources += [ "render_view_linux.cc" ] 100 sources += [ "render_view_linux.cc" ]
93 101
94 deps += [ 102 deps += [
95 "//third_party/android_tools:cpu_features", 103 "//third_party/android_tools:cpu_features",
96 "//third_party/libphonenumber", 104 "//third_party/libphonenumber",
97 ] 105 ]
98 } else { 106 } else {
99 sources -= [ 107 sources -= [
100 "java/gin_java_bridge_dispatcher.cc", 108 "java/gin_java_bridge_dispatcher.cc",
101 "java/gin_java_bridge_dispatcher.h", 109 "java/gin_java_bridge_dispatcher.h",
102 "java/gin_java_bridge_object.cc", 110 "java/gin_java_bridge_object.cc",
103 "java/gin_java_bridge_object.h", 111 "java/gin_java_bridge_object.h",
104 "java/gin_java_bridge_value_converter.cc", 112 "java/gin_java_bridge_value_converter.cc",
105 "java/gin_java_bridge_value_converter.h", 113 "java/gin_java_bridge_value_converter.h",
106 "java/gin_java_function_invocation_helper.cc", 114 "java/gin_java_function_invocation_helper.cc",
107 "java/gin_java_function_invocation_helper.h", 115 "java/gin_java_function_invocation_helper.h",
108 ] 116 ]
117
118 deps += [
119 "//device/devices_app/public/cpp",
120 "//device/devices_app/usb/public/interfaces",
121 ]
109 } 122 }
110 123
111 # TODO(jrg): remove the OS=="android" section? 124 # TODO(jrg): remove the OS=="android" section?
112 # http://crbug.com/113172 125 # http://crbug.com/113172
113 # Understand better how media_stream_ is tied into Chromium. 126 # Understand better how media_stream_ is tied into Chromium.
114 if (!enable_webrtc && is_android) { 127 if (!enable_webrtc && is_android) {
115 sources -= [ 128 sources -= [
116 "media/media_stream_audio_level_calculator.cc", 129 "media/media_stream_audio_level_calculator.cc",
117 "media/media_stream_audio_level_calculator.h", 130 "media/media_stream_audio_level_calculator.h",
118 "media/media_stream_center.h", 131 "media/media_stream_center.h",
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 217
205 if (enable_webvr) { 218 if (enable_webvr) {
206 sources += [ 219 sources += [
207 "vr/vr_dispatcher.cc", 220 "vr/vr_dispatcher.cc",
208 "vr/vr_dispatcher.h", 221 "vr/vr_dispatcher.h",
209 "vr/vr_type_converters.cc", 222 "vr/vr_type_converters.cc",
210 "vr/vr_type_converters.h", 223 "vr/vr_type_converters.h",
211 ] 224 ]
212 } 225 }
213 } 226 }
OLDNEW
« no previous file with comments | « content/public/test/render_view_test.cc ('k') | content/renderer/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698