diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-20 01:56:40 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-20 01:56:40 +0000 |
| commit | 1b1e9effe9fa3b66dd1bcfff4b78455460f66c61 (patch) | |
| tree | ca185a1ce62737b897b38ed77d8b8945dddec8df /chrome/chrome_dll_bundle.gypi | |
| parent | f0d119a1eb1211961315c7ce31984134798dbb47 (diff) | |
| download | chromium_src-1b1e9effe9fa3b66dd1bcfff4b78455460f66c61.zip chromium_src-1b1e9effe9fa3b66dd1bcfff4b78455460f66c61.tar.gz chromium_src-1b1e9effe9fa3b66dd1bcfff4b78455460f66c61.tar.bz2 | |
Add the pdf plugin's source in src\pdf.
I've updated gypi files to not use internal_pdf variable anymore, which was brought in from pdf repo's supplemental.gypi.
R=thestig@chromium.org
TBR=darin
Review URL: https://codereview.chromium.org/294793003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271531 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_dll_bundle.gypi')
| -rw-r--r-- | chrome/chrome_dll_bundle.gypi | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/chrome/chrome_dll_bundle.gypi b/chrome/chrome_dll_bundle.gypi index b168496..81ed0b9 100644 --- a/chrome/chrome_dll_bundle.gypi +++ b/chrome/chrome_dll_bundle.gypi @@ -76,6 +76,7 @@ # Bring in pdfsqueeze and run it on all pdfs '../build/temp_gyp/pdfsqueeze.gyp:pdfsqueeze', '../crypto/crypto.gyp:crypto', + '../pdf/pdf.gyp:pdf', # On Mac, Flash gets put into the framework, so we need this # dependency here. flash_player.gyp will copy the Flash bundle # into PRODUCT_DIR. @@ -146,13 +147,10 @@ }, { 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Internet Plug-Ins', - 'files': [], + 'files': [ + '<(PRODUCT_DIR)/PDF.plugin', + ], 'conditions': [ - ['internal_pdf', { - 'files': [ - '<(PRODUCT_DIR)/PDF.plugin', - ], - }], ['disable_nacl!=1', { 'files': [ '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.plugin', @@ -278,11 +276,6 @@ }, ], }], # mac_keystone - ['internal_pdf', { - 'dependencies': [ - '../pdf/pdf.gyp:pdf', - ], - }], ['debug_devtools==1', { 'postbuilds': [{ 'postbuild_name': 'Copy inspector files', |