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

Side by Side Diff: trunk/src/ui/views/BUILD.gn

Issue 400493006: Revert 283946 "GN fixes for the Windows build." (Closed) Base URL: svn://svn.chromium.org/chrome/
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 | Annotate | Revision Log
« no previous file with comments | « trunk/src/components/storage_monitor/BUILD.gn ('k') | no next file » | 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 7
8 gypi_values = exec_script( 8 gypi_values = exec_script(
9 "//build/gypi_to_gn.py", 9 "//build/gypi_to_gn.py",
10 [ rebase_path("views.gyp") ], 10 [ rebase_path("views.gyp") ],
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 if (use_x11 && !is_chromeos) { 51 if (use_x11 && !is_chromeos) {
52 deps += [ "//ui/display/util" ] 52 deps += [ "//ui/display/util" ]
53 } 53 }
54 if (is_linux && !is_chromeos) { 54 if (is_linux && !is_chromeos) {
55 sources -= [ "window/window_button_order_provider.cc" ] 55 sources -= [ "window/window_button_order_provider.cc" ]
56 deps += [ "//ui/shell_dialogs" ] 56 deps += [ "//ui/shell_dialogs" ]
57 } else { 57 } else {
58 sources -= [ 58 sources -= [
59 "linux_ui/linux_ui.h", 59 "linux_ui/linux_ui.h",
60 "linux_ui/linux_ui.cc", 60 "linux_ui/linux_ui.cc",
61 "linux_ui/status_icon_linux.h",
62 "linux_ui/status_icon_linux.cc",
61 "linux_ui/window_button_order_observer.h", 63 "linux_ui/window_button_order_observer.h",
62 "linux_ui/window_button_order_provider.cc", 64 "linux_ui/window_button_order_provider.cc",
63 ] 65 ]
64 } 66 }
65 67
66 if (is_chromeos) {
67 sources -= [
68 "linux_ui/status_icon_linux.h",
69 "linux_ui/status_icon_linux.cc",
70 ]
71 }
72
73 if (is_win) { 68 if (is_win) {
74 sources += gypi_values.views_win_sources 69 sources += gypi_values.views_win_sources
75 cflags = [ "/wd4267" ] # TODO(jschuh): crbug.com/167187 fix size_t to int t runcations. 70 cflags = [ "/wd4267" ] # TODO(jschuh): crbug.com/167187 fix size_t to int t runcations.
76 libs = [ "/imm32.lib", "oleacc.lib" ] 71 libs = [ "/imm32.lib", "oleacc.lib" ]
77 ldflags = [ "/DELAYLOAD:user32.dll" ] 72 ldflags = [ "/DELAYLOAD:user32.dll" ]
78 deps += [ 73 deps += [
79 "//third_party/iaccessible2", 74 "//third_party/iaccessible2",
80 "//third_party/wtl", 75 "//third_party/wtl",
81 ] 76 ]
82 } 77 }
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 "//ui/compositor", 250 "//ui/compositor",
256 "//ui/resources", 251 "//ui/resources",
257 "//ui/resources:ui_test_pak", 252 "//ui/resources:ui_test_pak",
258 "//ui/string", 253 "//ui/string",
259 "//ui/wm", 254 "//ui/wm",
260 ] 255 ]
261 } 256 }
262 } 257 }
263 258
264 } # if false 259 } # if false
OLDNEW
« no previous file with comments | « trunk/src/components/storage_monitor/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698