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

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

Issue 403503003: Avoid merging chrome_browser_desktop_linux_sources lists (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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( 9 gypi_values = exec_script(
10 "//build/gypi_to_gn.py", 10 "//build/gypi_to_gn.py",
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 ] 354 ]
355 } else { # 'OS!="win" 355 } else { # 'OS!="win"
356 if (use_aura) { 356 if (use_aura) {
357 deps += [ 357 deps += [
358 #'../ui/views/controls/webview/webview.gyp:webview', TODO(GYP) 358 #'../ui/views/controls/webview/webview.gyp:webview', TODO(GYP)
359 #'../ui/views/views.gyp:views', TODO(GYP) 359 #'../ui/views/views.gyp:views', TODO(GYP)
360 ] 360 ]
361 } 361 }
362 } 362 }
363 if (is_desktop_linux) { 363 if (is_desktop_linux) {
364 sources += rebase_path(gypi_values.chrome_browser_desktop_linux_sources, 364 sources += rebase_path(gypi_values.chrome_browser_ui_desktop_linux_sources,
365 ".", "//chrome") 365 ".", "//chrome")
366 } 366 }
367 if (is_linux) { # Both desktop Linux and ChromeOS. 367 if (is_linux) { # Both desktop Linux and ChromeOS.
368 sources += rebase_path(gypi_values.chrome_browser_ui_linux_sources, 368 sources += rebase_path(gypi_values.chrome_browser_ui_linux_sources,
369 ".", "//chrome") 369 ".", "//chrome")
370 configs += [ "//build/config/linux:udev" ] 370 configs += [ "//build/config/linux:udev" ]
371 if (use_aura) { 371 if (use_aura) {
372 configs += [ "//build/config/linux:fontconfig" ] 372 configs += [ "//build/config/linux:fontconfig" ]
373 deps += [ "//dbus" ] 373 deps += [ "//dbus" ]
374 } 374 }
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 } 412 }
413 if (enable_service_discovery) { 413 if (enable_service_discovery) {
414 sources += rebase_path( 414 sources += rebase_path(
415 gypi_values.chrome_browser_ui_service_discovery_sources, 415 gypi_values.chrome_browser_ui_service_discovery_sources,
416 ".", "//chrome") 416 ".", "//chrome")
417 } 417 }
418 if (enable_spellcheck) { 418 if (enable_spellcheck) {
419 deps += [ "//third_party/hunspell" ] 419 deps += [ "//third_party/hunspell" ]
420 } 420 }
421 } 421 }
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