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

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

Issue 877553008: Land prep work to enable NaCl in the Linux x64 GN builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: yet more feedback 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 | « chrome/browser/nacl_host/test/BUILD.gn ('k') | chrome/common/BUILD.gn » ('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 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 "//chrome") 151 "//chrome")
152 } 152 }
153 if (enable_task_manager) { 153 if (enable_task_manager) {
154 sources += rebase_path(gypi_values.chrome_browser_ui_task_manager_sources, 154 sources += rebase_path(gypi_values.chrome_browser_ui_task_manager_sources,
155 ".", 155 ".",
156 "//chrome") 156 "//chrome")
157 if (!toolkit_views || is_mac) { 157 if (!toolkit_views || is_mac) {
158 sources -= [ "views/task_manager_view.cc" ] 158 sources -= [ "views/task_manager_view.cc" ]
159 } 159 }
160 } 160 }
161 if (!enable_nacl) { 161 if (enable_nacl) {
162 sources += 162 sources +=
163 rebase_path(gypi_values.chrome_browser_ui_nacl_sources, ".", "//chrome") 163 rebase_path(gypi_values.chrome_browser_ui_nacl_sources, ".", "//chrome")
164 deps += [ 164 deps += [ "//native_client/src/trusted/service_runtime:sel" ]
165 #"//native_client/src/trusted/service_runtime/service_runtime.gyp:sel", T ODO(GYP)
166 ]
167 } 165 }
168 if (enable_configuration_policy) { 166 if (enable_configuration_policy) {
169 sources += rebase_path(gypi_values.chrome_browser_ui_policy_sources, 167 sources += rebase_path(gypi_values.chrome_browser_ui_policy_sources,
170 ".", 168 ".",
171 "//chrome") 169 "//chrome")
172 deps += [ "//components/policy" ] 170 deps += [ "//components/policy" ]
173 } 171 }
174 if (enable_plugins) { 172 if (enable_plugins) {
175 sources += rebase_path(gypi_values.chrome_browser_ui_plugin_sources, 173 sources += rebase_path(gypi_values.chrome_browser_ui_plugin_sources,
176 ".", 174 ".",
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
517 "//chrome/browser", 515 "//chrome/browser",
518 "//content/public/browser", 516 "//content/public/browser",
519 "//content/public/common", 517 "//content/public/common",
520 "//content/test:test_support", 518 "//content/test:test_support",
521 "//net:test_support", 519 "//net:test_support",
522 "//skia", 520 "//skia",
523 "//testing/gtest", 521 "//testing/gtest",
524 "//ui/base", 522 "//ui/base",
525 ] 523 ]
526 } 524 }
OLDNEW
« no previous file with comments | « chrome/browser/nacl_host/test/BUILD.gn ('k') | chrome/common/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698