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

Side by Side Diff: chrome/BUILD.gn

Issue 799643004: 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') | chrome/renderer/DEPS » ('J')
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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 #'../third_party/adobe/flash/flash_player.gyp:flapper_binaries', TODO(G YP) 104 #'../third_party/adobe/flash/flash_player.gyp:flapper_binaries', TODO(G YP)
105 105
106 # Copy CDM files to PRODUCT_DIR if applicable. Let the .gyp 106 # Copy CDM files to PRODUCT_DIR if applicable. Let the .gyp
107 # file decide what to do on a per-OS basis; on Mac, internal plugins 107 # file decide what to do on a per-OS basis; on Mac, internal plugins
108 # go inside the framework, so this dependency is in chrome_dll.gypi. 108 # go inside the framework, so this dependency is in chrome_dll.gypi.
109 #'../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter', TOD O(GYP) 109 #'../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter', TOD O(GYP)
110 ] 110 ]
111 # TODO(GYP) some stuff from GYP including chrome_multiple_dll. 111 # TODO(GYP) some stuff from GYP including chrome_multiple_dll.
112 } 112 }
113 113
114 if (!is_mac) { 114 if (enable_plugins) {
115 # On Mac this is done in chrome_dll.gypi. 115 deps += [ "//pdf" ]
116 datadeps += [ "//pdf" ]
117 # TODO(GYP) pdf linux symbols
118 } 116 }
119 } 117 }
120 } # !is_android 118 } # !is_android
121 119
122 shared_library("main_dll") { 120 shared_library("main_dll") {
123 configs += [ "//build/config/compiler:wexit_time_destructors" ] 121 configs += [ "//build/config/compiler:wexit_time_destructors" ]
124 122
125 deps = [ 123 deps = [
126 ":browser_dependencies", 124 ":browser_dependencies",
127 "//base/allocator", 125 "//base/allocator",
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 if (cld_version == 0 || cld_version == 2) { 188 if (cld_version == 0 || cld_version == 2) {
191 deps += [ "//third_party/cld_2" ] 189 deps += [ "//third_party/cld_2" ]
192 } 190 }
193 191
194 if (is_mac) { 192 if (is_mac) {
195 #['OS=="mac" and component!="shared_library"', { TODO(GYP) 193 #['OS=="mac" and component!="shared_library"', { TODO(GYP)
196 # 'includes': [ 'chrome_dll_bundle.gypi' ], 194 # 'includes': [ 'chrome_dll_bundle.gypi' ],
197 #}], 195 #}],
198 # TODO(GYP) Lots of other stuff in the OS=="mac" block. 196 # TODO(GYP) Lots of other stuff in the OS=="mac" block.
199 } 197 }
198
199 if (enable_plugins) {
200 deps += [ "//pdf" ]
201 }
200 } 202 }
201 203
202 # GYP version: chromium_browser_dependencies variable in chrome.gyp 204 # GYP version: chromium_browser_dependencies variable in chrome.gyp
203 group("browser_dependencies") { 205 group("browser_dependencies") {
204 deps = [ 206 deps = [
205 "//chrome/browser", 207 "//chrome/browser",
206 "//chrome/common", 208 "//chrome/common",
207 "//sync", 209 "//sync",
208 ] 210 ]
209 if (!is_ios) { 211 if (!is_ios) {
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after
599 "//chrome/browser", 601 "//chrome/browser",
600 "//chrome/browser/ui", 602 "//chrome/browser/ui",
601 "//chrome/plugin", 603 "//chrome/plugin",
602 "//chrome/renderer", 604 "//chrome/renderer",
603 "//chrome/utility", 605 "//chrome/utility",
604 "//components/enhanced_bookmarks", 606 "//components/enhanced_bookmarks",
605 "//content/public/app:browser", 607 "//content/public/app:browser",
606 ] 608 ]
607 } 609 }
608 } 610 }
OLDNEW
« no previous file with comments | « build/all.gyp ('k') | chrome/DEPS » ('j') | chrome/renderer/DEPS » ('J')

Powered by Google App Engine
This is Rietveld 408576698