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

Side by Side Diff: chrome/browser/ui/BUILD.gn

Issue 934323003: Remove dependency of 'browser_ui' on 'libusb' when building for iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix dependency for gn build too Created 5 years, 10 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 | « no previous file | chrome/chrome_browser_ui.gypi » ('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 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 8
9 gypi_values = exec_script("//build/gypi_to_gn.py", 9 gypi_values = exec_script("//build/gypi_to_gn.py",
10 [ rebase_path("../../chrome_browser_ui.gypi") ], 10 [ rebase_path("../../chrome_browser_ui.gypi") ],
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 "//components/password_manager/core/browser", 54 "//components/password_manager/core/browser",
55 "//components/resources", 55 "//components/resources",
56 "//components/strings", 56 "//components/strings",
57 "//components/update_client", 57 "//components/update_client",
58 "//content/public/browser", 58 "//content/public/browser",
59 "//content/public/common", 59 "//content/public/common",
60 "//crypto", 60 "//crypto",
61 "//skia", 61 "//skia",
62 "//third_party/cacheinvalidation", 62 "//third_party/cacheinvalidation",
63 "//third_party/icu", 63 "//third_party/icu",
64 "//third_party/libusb",
65 "//third_party/libxml", 64 "//third_party/libxml",
66 "//third_party/zlib", 65 "//third_party/zlib",
67 "//ui/accessibility", 66 "//ui/accessibility",
68 "//ui/base", 67 "//ui/base",
69 "//ui/content_accelerators", 68 "//ui/content_accelerators",
70 "//ui/events", 69 "//ui/events",
71 "//ui/events:gesture_detection", 70 "//ui/events:gesture_detection",
72 "//ui/gfx", 71 "//ui/gfx",
73 "//ui/gfx/geometry", 72 "//ui/gfx/geometry",
74 "//ui/message_center", 73 "//ui/message_center",
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 if (is_android) { 309 if (is_android) {
311 deps += [ 310 deps += [
312 "//chrome/browser:jni_headers", 311 "//chrome/browser:jni_headers",
313 "//crypto:platform", 312 "//crypto:platform",
314 313
315 #'../components/components.gyp:web_contents_delegate_android', TODO(GYP) 314 #'../components/components.gyp:web_contents_delegate_android', TODO(GYP)
316 ] 315 ]
317 deps -= [ 316 deps -= [
318 "//chrome/browser/ui/views", 317 "//chrome/browser/ui/views",
319 "//components/feedback/proto", 318 "//components/feedback/proto",
320 "//third_party/libusb",
321 "//ui/events", 319 "//ui/events",
322 ] 320 ]
323 sources += rebase_path(gypi_values.chrome_browser_ui_android_sources, 321 sources += rebase_path(gypi_values.chrome_browser_ui_android_sources,
324 ".", 322 ".",
325 "//chrome") 323 "//chrome")
326 324
327 defines += [ "CHROME_BUILD_ID=" + android_chrome_build_id ] 325 defines += [ "CHROME_BUILD_ID=" + android_chrome_build_id ]
328 } 326 }
329 327
330 if (is_mac) { 328 if (is_mac) {
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 if (enable_app_list) { 400 if (enable_app_list) {
403 sources += rebase_path(gypi_values.chrome_browser_ui_app_list_sources, 401 sources += rebase_path(gypi_values.chrome_browser_ui_app_list_sources,
404 ".", 402 ".",
405 "//chrome") 403 "//chrome")
406 deps += [ "//ui/app_list" ] 404 deps += [ "//ui/app_list" ]
407 } else { 405 } else {
408 sources += rebase_path(gypi_values.chrome_browser_ui_non_app_list_sources, 406 sources += rebase_path(gypi_values.chrome_browser_ui_non_app_list_sources,
409 ".", 407 ".",
410 "//chrome") 408 "//chrome")
411 } 409 }
412 if (enable_autofill_dialog) { 410 if (enable_autofill_dialog) {
Nico 2015/02/18 19:40:55 This is in an if (enable_autofill_dialog) block –
sdefresne 2015/02/18 19:46:42 Probably not, good catch. Fixed, please take anoth
413 sources += 411 sources +=
414 rebase_path(gypi_values.chrome_browser_ui_autofill_dialog_sources, 412 rebase_path(gypi_values.chrome_browser_ui_autofill_dialog_sources,
415 ".", 413 ".",
416 "//chrome") 414 "//chrome")
417 if (!is_android && !is_ios) { 415 if (!is_android && !is_ios) {
418 sources += rebase_path( 416 sources += rebase_path(
419 gypi_values.chrome_browser_ui_autofill_dialog_non_mobile_sources, 417 gypi_values.chrome_browser_ui_autofill_dialog_non_mobile_sources,
420 ".", 418 ".",
421 "//chrome") 419 "//chrome")
422 deps += [ 420 deps += [
423 "//third_party/libaddressinput", 421 "//third_party/libaddressinput",
424 "//third_party/libaddressinput:strings", 422 "//third_party/libaddressinput:strings",
423 "//third_party/libusb",
425 ] 424 ]
426 } 425 }
427 } 426 }
428 if (enable_extensions) { 427 if (enable_extensions) {
429 deps += [ 428 deps += [
430 "//chrome/browser/extensions", 429 "//chrome/browser/extensions",
431 "//chrome/common/extensions/api", 430 "//chrome/common/extensions/api",
432 "//chrome/common/extensions/api:api_registration", 431 "//chrome/common/extensions/api:api_registration",
433 ] 432 ]
434 sources += rebase_path(gypi_values.chrome_browser_ui_extensions_sources, 433 sources += rebase_path(gypi_values.chrome_browser_ui_extensions_sources,
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
518 "//chrome/browser", 517 "//chrome/browser",
519 "//content/public/browser", 518 "//content/public/browser",
520 "//content/public/common", 519 "//content/public/common",
521 "//content/test:test_support", 520 "//content/test:test_support",
522 "//net:test_support", 521 "//net:test_support",
523 "//skia", 522 "//skia",
524 "//testing/gtest", 523 "//testing/gtest",
525 "//ui/base", 524 "//ui/base",
526 ] 525 ]
527 } 526 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698