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

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

Issue 492323002: Revert of Only build various flash/pnacl/ppapi code when they are enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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_tests_unit.gypi ('k') | chrome/common/chrome_content_client.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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 "//chrome/common/extensions/api", 86 "//chrome/common/extensions/api",
87 "//components/visitedlink/common", 87 "//components/visitedlink/common",
88 "//components/autofill/content/common", 88 "//components/autofill/content/common",
89 "//components/autofill/core/common", 89 "//components/autofill/core/common",
90 "//components/password_manager/core/common", 90 "//components/password_manager/core/common",
91 "//components/signin/core/common", 91 "//components/signin/core/common",
92 "//components/translate/content/common", 92 "//components/translate/content/common",
93 "//extensions/common", 93 "//extensions/common",
94 "//extensions/common/api", 94 "//extensions/common/api",
95 "//ipc", 95 "//ipc",
96 "//third_party/adobe/flash:flapper_version_h",
96 "//third_party/re2", 97 "//third_party/re2",
97 "//third_party/widevine/cdm:version_h", 98 "//third_party/widevine/cdm:version_h",
98 ] 99 ]
99 } 100 }
100 101
101 if (enable_extensions) { 102 if (enable_extensions) {
102 sources += rebase_path( 103 sources += rebase_path(
103 gypi_values.chrome_common_extensions_sources, 104 gypi_values.chrome_common_extensions_sources,
104 ".", "//chrome") 105 ".", "//chrome")
105 deps += [ 106 deps += [
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 ] 203 ]
203 deps += [ 204 deps += [
204 "//third_party/mach_override", 205 "//third_party/mach_override",
205 "//third_party/google_toolbox_for_mac", 206 "//third_party/google_toolbox_for_mac",
206 ] 207 ]
207 } 208 }
208 209
209 if (enable_remoting) { 210 if (enable_remoting) {
210 #deps += [ '../remoting/remoting.gyp:remoting_client_plugin' ] TODO(GYP) 211 #deps += [ '../remoting/remoting.gyp:remoting_client_plugin' ] TODO(GYP)
211 } 212 }
212 if (enable_plugins) { 213 if (!enable_plugins) {
213 deps += [
214 "//third_party/adobe/flash:flapper_version_h",
215 ]
216 } else {
217 sources -= [ "pepper_permission_util.cc" ] 214 sources -= [ "pepper_permission_util.cc" ]
218 } 215 }
219 if (!enable_webrtc) { 216 if (!enable_webrtc) {
220 sources -= [ "media/webrtc_logging_messages.h" ] 217 sources -= [ "media/webrtc_logging_messages.h" ]
221 } 218 }
222 if (enable_configuration_policy) { 219 if (enable_configuration_policy) {
223 deps += [ "//components/policy" ] 220 deps += [ "//components/policy" ]
224 } 221 }
225 222
226 if (safe_browsing_mode == 1) { 223 if (safe_browsing_mode == 1) {
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 "//components/bookmarks/common", 280 "//components/bookmarks/common",
284 "//third_party/widevine/cdm:version_h", 281 "//third_party/widevine/cdm:version_h",
285 ] 282 ]
286 283
287 if (enable_nacl) { 284 if (enable_nacl) {
288 deps += [ 285 deps += [
289 #'../components/nacl.gyp:nacl_switches', TODO(GYP) 286 #'../components/nacl.gyp:nacl_switches', TODO(GYP)
290 ] 287 ]
291 } 288 }
292 } 289 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | chrome/common/chrome_content_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698