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

Side by Side Diff: chrome/common/BUILD.gn

Issue 435343002: Move NaClModulesHandler to src/extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: (nacl-modules) rebase, fix gyp Created 6 years, 4 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 | « chrome/chrome_common.gypi ('k') | chrome/common/extensions/chrome_manifest_handlers.cc » ('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 gypi_values = exec_script( 7 gypi_values = exec_script(
8 "//build/gypi_to_gn.py", 8 "//build/gypi_to_gn.py",
9 [ rebase_path("../chrome_common.gypi") ], 9 [ rebase_path("../chrome_common.gypi") ],
10 "scope", 10 "scope",
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 if (is_mac) { 128 if (is_mac) {
129 sources += rebase_path( 129 sources += rebase_path(
130 gypi_values.chrome_common_mac_sources, 130 gypi_values.chrome_common_mac_sources,
131 ".", "//chrome") 131 ".", "//chrome")
132 } 132 }
133 133
134 if (enable_nacl) { 134 if (enable_nacl) {
135 deps += [ 135 deps += [
136 #'<(DEPTH)/components/nacl.gyp:nacl_common', TODO(GYP) 136 #'<(DEPTH)/components/nacl.gyp:nacl_common', TODO(GYP)
137 ] 137 ]
138 sources += [
139 "extensions/manifest_handlers/nacl_modules_handler.cc",
140 "extensions/manifest_handlers/nacl_modules_handler.h",
141 ]
142 } 138 }
143 139
144 # Printing. 140 # Printing.
145 if (printing_mode == 0) { 141 if (printing_mode == 0) {
146 sources -= [ 142 sources -= [
147 "print_messages.cc", 143 "print_messages.cc",
148 "print_messages.h", 144 "print_messages.h",
149 ] 145 ]
150 } else { 146 } else {
151 deps += [ "//printing" ] 147 deps += [ "//printing" ]
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 "//components/bookmarks/common", 300 "//components/bookmarks/common",
305 "//third_party/widevine/cdm:version_h", 301 "//third_party/widevine/cdm:version_h",
306 ] 302 ]
307 303
308 if (enable_nacl) { 304 if (enable_nacl) {
309 deps += [ 305 deps += [
310 #'../components/nacl.gyp:nacl_switches', TODO(GYP) 306 #'../components/nacl.gyp:nacl_switches', TODO(GYP)
311 ] 307 ]
312 } 308 }
313 } 309 }
OLDNEW
« no previous file with comments | « chrome/chrome_common.gypi ('k') | chrome/common/extensions/chrome_manifest_handlers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698