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

Side by Side Diff: extensions/browser/BUILD.gn

Issue 497363004: Merge components/usb_service into device/usb. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 6 years, 3 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 | « device/usb/usb_service_unittest.cc ('k') | extensions/browser/api/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/crypto.gni") 5 import("//build/config/crypto.gni")
6 import("//build/config/features.gni") 6 import("//build/config/features.gni")
7 7
8 # GYP version: extensions/extensions.gyp:extensions_browser 8 # GYP version: extensions/extensions.gyp:extensions_browser
9 source_set("browser") { 9 source_set("browser") {
10 sources = [ 10 sources = [
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 "verified_contents.h", 342 "verified_contents.h",
343 "view_type_utils.cc", 343 "view_type_utils.cc",
344 "view_type_utils.h", 344 "view_type_utils.h",
345 "warning_service.cc", 345 "warning_service.cc",
346 "warning_service.h", 346 "warning_service.h",
347 "warning_set.cc", 347 "warning_set.cc",
348 "warning_set.h", 348 "warning_set.h",
349 ] 349 ]
350 350
351 deps += [ 351 deps += [
352 "//components/usb_service",
353 "//crypto:platform", 352 "//crypto:platform",
354 "//device/bluetooth", 353 "//device/bluetooth",
355 "//device/hid", 354 "//device/hid",
356 "//device/serial", 355 "//device/serial",
356 "//device/usb",
357 "//extensions/browser/api/cast_channel:cast_channel_proto", 357 "//extensions/browser/api/cast_channel:cast_channel_proto",
358 ] 358 ]
359 359
360 if (use_openssl) { 360 if (use_openssl) {
361 sources += [ 361 sources += [
362 "api/cast_channel/cast_auth_util_openssl.cc", 362 "api/cast_channel/cast_auth_util_openssl.cc",
363 ] 363 ]
364 } else { 364 } else {
365 sources += [ 365 sources += [
366 "api/cast_channel/cast_auth_util_nss.cc", 366 "api/cast_channel/cast_auth_util_nss.cc",
367 ] 367 ]
368 } 368 }
369 } 369 }
370 370
371 if (is_win) { 371 if (is_win) {
372 cflags = [ 372 cflags = [
373 "/wd4267", # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 373 "/wd4267", # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
374 ] 374 ]
375 } 375 }
376 } 376 }
OLDNEW
« no previous file with comments | « device/usb/usb_service_unittest.cc ('k') | extensions/browser/api/usb/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698