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

Unified Diff: chrome/chrome_exe.gypi

Issue 294793003: Add the pdf plugin's source in src\pdf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: review comments and sync past DEPS roll to fix gyp Created 6 years, 7 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_exe.gypi
===================================================================
--- chrome/chrome_exe.gypi (revision 271525)
+++ chrome/chrome_exe.gypi (working copy)
@@ -368,7 +368,7 @@
'--breakpad=0',
'--keystone=<(mac_keystone)',
'--scm=1',
- '--pdf=<(internal_pdf)',
+ '--pdf=1',
'--bundle_id=<(mac_bundle_id)'],
},
{
@@ -430,23 +430,17 @@
# chrome/app/theme/google_chrome/BRANDING have the short name
# "chrome" etc.; should we try to extract from there instead?
- # On Mac, this is done in chrome_dll.gypi.
- ['internal_pdf', {
+ # CrOS does this in a separate build step.
+ ['OS=="linux" and chromeos==0 and linux_dump_symbols==1', {
'dependencies': [
- '../pdf/pdf.gyp:pdf',
+ '../pdf/pdf.gyp:pdf_linux_symbols',
],
- 'conditions': [
- # CrOS does this in a separate build step.
- ['OS=="linux" and chromeos==0 and linux_dump_symbols==1', {
- 'dependencies': [
- '../pdf/pdf.gyp:pdf_linux_symbols',
- ],
- }], # OS=="linux" and chromeos==0 and linux_dump_symbols==1
- ],
- }], # internal_pdf
+ }], # OS=="linux" and chromeos==0 and linux_dump_symbols==1
],
'dependencies': [
'../components/components.gyp:startup_metric_utils',
+ # On Mac, this is done in chrome_dll.gypi.
+ '../pdf/pdf.gyp:pdf',
'chrome_resources.gyp:packed_extra_resources',
'chrome_resources.gyp:packed_resources',
# Copy Flash Player files to PRODUCT_DIR if applicable. Let the .gyp
« no previous file with comments | « chrome/chrome_dll_bundle.gypi ('k') | chrome/chrome_installer.gypi » ('j') | pdf/pdf.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698