Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 199 ".", | 199 ".", |
| 200 "//chrome") | 200 "//chrome") |
| 201 deps += [ "//components/constrained_window" ] | 201 deps += [ "//components/constrained_window" ] |
| 202 if (!is_chromeos) { | 202 if (!is_chromeos) { |
| 203 sources += | 203 sources += |
| 204 rebase_path(gypi_values.chrome_browser_ui_views_non_chromeos_sources, | 204 rebase_path(gypi_values.chrome_browser_ui_views_non_chromeos_sources, |
| 205 ".", | 205 ".", |
| 206 "//chrome") | 206 "//chrome") |
| 207 } | 207 } |
| 208 if (!is_mac) { | 208 if (!is_mac) { |
| 209 sources += | 209 if (!enable_extensions) { |
| 210 rebase_path(gypi_values.chrome_browser_ui_views_non_mac_sources, | 210 set_sources_assignment_filter( |
| 211 ".", | 211 sources_assignment_filter + [ "*/extensions/*" ]) |
|
brettw
2015/06/07 22:48:00
Our rule in the GN build is to only use the filter
sadrul
2015/06/09 21:08:35
Done.
| |
| 212 "//chrome") | 212 sources += |
| 213 deps += [ "//extensions/components/native_app_window" ] | 213 rebase_path(gypi_values.chrome_browser_ui_views_non_mac_sources, |
| 214 ".", | |
| 215 "//chrome") | |
| 216 set_sources_assignment_filter(sources_assignment_filter) | |
| 217 } else { | |
| 218 sources += | |
| 219 rebase_path(gypi_values.chrome_browser_ui_views_non_mac_sources, | |
| 220 ".", | |
| 221 "//chrome") | |
| 222 deps += [ "//extensions/components/native_app_window" ] | |
| 223 } | |
| 214 if (is_chromeos) { | 224 if (is_chromeos) { |
| 215 # TODO(GYP): crbug.com/481629. These files should probably not be | 225 # TODO(GYP): crbug.com/481629. These files should probably not be |
| 216 # a part of ui_views_non_mac_sources at all. | 226 # a part of ui_views_non_mac_sources at all. |
| 217 sources -= [ | 227 sources -= [ |
| 218 "views/frame/opaque_browser_frame_view.cc", | 228 "views/frame/opaque_browser_frame_view.cc", |
| 219 "views/frame/opaque_browser_frame_view.h", | 229 "views/frame/opaque_browser_frame_view.h", |
| 220 "views/frame/opaque_browser_frame_view_linux.cc", | 230 "views/frame/opaque_browser_frame_view_linux.cc", |
| 221 "views/frame/opaque_browser_frame_view_linux.h", | 231 "views/frame/opaque_browser_frame_view_linux.h", |
| 222 ] | 232 ] |
| 223 } | 233 } |
| (...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 513 "//chrome/browser", | 523 "//chrome/browser", |
| 514 "//content/public/browser", | 524 "//content/public/browser", |
| 515 "//content/public/common", | 525 "//content/public/common", |
| 516 "//content/test:test_support", | 526 "//content/test:test_support", |
| 517 "//net:test_support", | 527 "//net:test_support", |
| 518 "//skia", | 528 "//skia", |
| 519 "//testing/gtest", | 529 "//testing/gtest", |
| 520 "//ui/base", | 530 "//ui/base", |
| 521 ] | 531 ] |
| 522 } | 532 } |
| OLD | NEW |