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

Side by Side Diff: chrome/app/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/BUILD.gn ('k') | chrome/browser/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("//tools/grit/grit_rule.gni") 5 import("//tools/grit/grit_rule.gni")
6 6
7 if (is_android) { 7 if (is_android) {
8 import("//build/config/android/rules.gni") 8 import("//build/config/android/rules.gni")
9 android_generated_java_resources = [ 9 android_generated_java_resources = [
10 "java/res/values-am/generated_resources.xml", 10 "java/res/values-am/generated_resources.xml",
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 "//chrome/utility", 311 "//chrome/utility",
312 "//content/public/app:both", 312 "//content/public/app:both",
313 "//content/public/common", 313 "//content/public/common",
314 "//ui/base", 314 "//ui/base",
315 ] 315 ]
316 316
317 if (is_mac) { 317 if (is_mac) {
318 sources += [ "chrome_main_mac.mm" ] 318 sources += [ "chrome_main_mac.mm" ]
319 } 319 }
320 320
321 # TODO(gyp) if (enable_plugins and enable_nacl) { 321 if (enable_plugins && enable_nacl) {
322 # deps += [ "'<(DEPTH)/components/nacl/renderer/plugin/plugin.gyp:nacl_truste d_plugin'," ] 322 deps += [ "//components/nacl/renderer/plugin:nacl_trusted_plugin" ]
323 # } 323 }
324 324
325 if (enable_remoting) { 325 if (enable_remoting) {
326 deps += [ "//remoting/client/plugin" ] 326 deps += [ "//remoting/client/plugin" ]
327 } 327 }
328 } 328 }
OLDNEW
« no previous file with comments | « chrome/BUILD.gn ('k') | chrome/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698