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

Side by Side Diff: chrome/BUILD.gn

Issue 899033002: Revert of Combine PDF plugin into the Chromium binary. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « build/all.gyp ('k') | chrome/DEPS » ('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/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/locales.gni") 6 import("//build/config/locales.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 import("//chrome/chrome_repack_locales.gni") 8 import("//chrome/chrome_repack_locales.gni")
9 import("//chrome/version.gni") 9 import("//chrome/version.gni")
10 10
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 #'../third_party/adobe/flash/flash_player.gyp:flapper_binaries', TODO(G YP) 143 #'../third_party/adobe/flash/flash_player.gyp:flapper_binaries', TODO(G YP)
144 144
145 # Copy CDM files to PRODUCT_DIR if applicable. Let the .gyp 145 # Copy CDM files to PRODUCT_DIR if applicable. Let the .gyp
146 # file decide what to do on a per-OS basis; on Mac, internal plugins 146 # file decide what to do on a per-OS basis; on Mac, internal plugins
147 # go inside the framework, so this dependency is in chrome_dll.gypi. 147 # go inside the framework, so this dependency is in chrome_dll.gypi.
148 #'../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter', TOD O(GYP) 148 #'../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter', TOD O(GYP)
149 ] 149 ]
150 # TODO(GYP) some stuff from GYP including chrome_multiple_dll. 150 # TODO(GYP) some stuff from GYP including chrome_multiple_dll.
151 } 151 }
152 152
153 if (enable_plugins) { 153 if (!is_mac) {
154 deps += [ "//pdf" ] 154 # On Mac this is done in chrome_dll.gypi.
155 datadeps += [ "//pdf" ]
156 # TODO(GYP) pdf linux symbols
155 } 157 }
156 } 158 }
157 } # !is_android 159 } # !is_android
158 160
159 if (!is_win || link_chrome_on_windows) { 161 if (!is_win || link_chrome_on_windows) {
160 shared_library("main_dll") { 162 shared_library("main_dll") {
161 configs += [ "//build/config/compiler:wexit_time_destructors" ] 163 configs += [ "//build/config/compiler:wexit_time_destructors" ]
162 164
163 deps = [ 165 deps = [
164 ":browser_dependencies", 166 ":browser_dependencies",
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 if (cld_version == 0 || cld_version == 2) { 230 if (cld_version == 0 || cld_version == 2) {
229 deps += [ "//third_party/cld_2" ] 231 deps += [ "//third_party/cld_2" ]
230 } 232 }
231 233
232 if (is_mac) { 234 if (is_mac) {
233 #['OS=="mac" and component!="shared_library"', { TODO(GYP) 235 #['OS=="mac" and component!="shared_library"', { TODO(GYP)
234 # 'includes': [ 'chrome_dll_bundle.gypi' ], 236 # 'includes': [ 'chrome_dll_bundle.gypi' ],
235 #}], 237 #}],
236 # TODO(GYP) Lots of other stuff in the OS=="mac" block. 238 # TODO(GYP) Lots of other stuff in the OS=="mac" block.
237 } 239 }
238
239 if (enable_plugins) {
240 deps += [ "//pdf" ]
241 }
242 } 240 }
243 } 241 }
244 242
245 # GYP version: chromium_browser_dependencies variable in chrome.gyp 243 # GYP version: chromium_browser_dependencies variable in chrome.gyp
246 group("browser_dependencies") { 244 group("browser_dependencies") {
247 deps = [ 245 deps = [
248 "//chrome/browser", 246 "//chrome/browser",
249 "//chrome/common", 247 "//chrome/common",
250 "//sync", 248 "//sync",
251 ] 249 ]
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after
690 "//chrome/browser/ui", 688 "//chrome/browser/ui",
691 "//chrome/child", 689 "//chrome/child",
692 "//chrome/plugin", 690 "//chrome/plugin",
693 "//chrome/renderer", 691 "//chrome/renderer",
694 "//chrome/utility", 692 "//chrome/utility",
695 "//components/enhanced_bookmarks", 693 "//components/enhanced_bookmarks",
696 "//content/public/app:browser", 694 "//content/public/app:browser",
697 ] 695 ]
698 } 696 }
699 } 697 }
OLDNEW
« no previous file with comments | « build/all.gyp ('k') | chrome/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698