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

Unified Diff: chrome/chrome_dll_bundle.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
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | chrome/chrome_exe.gypi » ('j') | pdf/pdf.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_dll_bundle.gypi
===================================================================
--- chrome/chrome_dll_bundle.gypi (revision 271525)
+++ chrome/chrome_dll_bundle.gypi (working copy)
@@ -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',
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | chrome/chrome_exe.gypi » ('j') | pdf/pdf.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698