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

Unified Diff: chrome/chrome_dll.gypi

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, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/chrome_dll.gypi
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 024f34dbf3bcda2981322d757b32394ca8d5f6ad..08856685b0ca107f5e528330841c388e0755f6ad 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -256,6 +256,11 @@
'../content/content.gyp:content_app_browser',
],
}],
+ ['chrome_multiple_dll==0 and enable_plugins==1', {
+ 'dependencies': [
+ '../pdf/pdf.gyp:pdf',
+ ],
+ }],
['cld_version==1', {
'dependencies': [
'<(DEPTH)/third_party/cld/cld.gyp:cld',
@@ -278,9 +283,6 @@
# sets -order_file.
'ORDER_FILE': 'app/framework.order',
},
- 'dependencies': [
- '../pdf/pdf.gyp:pdf',
- ],
'include_dirs': [
'<(grit_out_dir)',
],
@@ -372,6 +374,11 @@
}],
]
}],
+ ['enable_plugins==1', {
+ 'dependencies': [
+ '../pdf/pdf.gyp:pdf',
+ ],
+ }],
],
}, # target chrome_child_dll
],
« no previous file with comments | « chrome/chrome.isolate ('k') | chrome/chrome_dll_bundle.gypi » ('j') | pdf/pdf.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698