Update installer for internal plugin.

Review URL: http://codereview.chromium.org/2799006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49757 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 33 insertions, 5 deletions

diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 61465d8..e5825ee 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -288,6 +288,11 @@
                 # dependency here. flash_player.gyp will copy the Flash bundle
                 # into PRODUCT_DIR.
                 '../third_party/adobe/flash/flash_player.gyp:flash_player',
+                'conditions': [
+                  ['internal_pdf', {
+                    '../pdf/pdf.gyp:pdf',
+                  }],
+                ],
               ],
               'rules': [
                 {
@@ -475,6 +480,11 @@
                         '<(PRODUCT_DIR)/plugin.vch',
                       ],
                     }],
+                    ['internal_pdf', {
+                      'files': [
+                        '<(PRODUCT_DIR)/PDF.plugin',
+                      ],
+                    }],
                   ],
                 },
               ],
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index a8a714f..df88ce6 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -401,6 +401,12 @@
               # etc.; should we try to extract from there instead?
               'product_name': 'chrome'
             }],
+            # On Mac, this is done in chrome_dll.gypi.
+            ['internal_pdf', {
+              'dependencies': [
+                '../pdf/pdf.gyp:pdf',
+              ],
+            }],
           ],
           'dependencies': [
             'packed_extra_resources',
@@ -433,11 +439,6 @@
             },
           },
         }],
-        ['internal_pdf', {
-          'dependencies': [
-            '../pdf/pdf.gyp:pdf',
-          ],
-        }],
       ],
     },
     {
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi
index 31fcb878..a041851 100644
--- a/chrome/chrome_installer.gypi
+++ b/chrome/chrome_installer.gypi
@@ -351,6 +351,7 @@
           '<(PRODUCT_DIR)/libffmpegsumo.so',
           '<(PRODUCT_DIR)/xdg-settings',
           '<(PRODUCT_DIR)/locales/en-US.pak',
+          '<(PRODUCT_DIR)/libpdf.so',
         ],
         'flock_bash': ['flock', '--', '/tmp/linux_package_lock', 'bash'],
         'deb_build': '<(PRODUCT_DIR)/installer/debian/build.sh',
diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release
index 10bcc81..311b5deec 100644
--- a/chrome/installer/mini_installer/chrome.release
+++ b/chrome/installer/mini_installer/chrome.release
@@ -56,6 +56,7 @@ Resources\calendar_app\*.*: %(VersionDir)s\Resources\calendar_app
 Resources\docs_app\*.*: %(VersionDir)s\Resources\docs_app
 Extensions\*.*: %(VersionDir)s\Extensions\
 av*.dll: %(VersionDir)s\
+pdf.dll: %(VersionDir)s\
 
 [GOOGLE_CHROME]
 gcswf32.dll: %(VersionDir)s\
diff --git a/chrome/installer/mini_installer/chrome_frame.release b/chrome/installer/mini_installer/chrome_frame.release
index 37d7c97..1e5fce3 100644
--- a/chrome/installer/mini_installer/chrome_frame.release
+++ b/chrome/installer/mini_installer/chrome_frame.release
@@ -44,6 +44,7 @@ servers\*.dll: %(VersionDir)s\
 servers\*.exe: %(VersionDir)s\
 Extensions\*.*: %(VersionDir)s\Extensions\
 av*.dll: %(VersionDir)s\
+pdf.dll: %(VersionDir)s\
 
 [GOOGLE_CHROME]
 gcswf32.dll: %(VersionDir)s\
diff --git a/chrome/tools/build/linux/FILES b/chrome/tools/build/linux/FILES
index 55b60ac..62e2aa4 100644
--- a/chrome/tools/build/linux/FILES
+++ b/chrome/tools/build/linux/FILES
@@ -9,3 +9,4 @@ locales
 product_logo_48.png
 resources
 xdg-settings
+libpdf.so
diff --git a/chrome/tools/build/linux/FILES.cfg b/chrome/tools/build/linux/FILES.cfg
index dc68a0f..e2bd627 100644
--- a/chrome/tools/build/linux/FILES.cfg
+++ b/chrome/tools/build/linux/FILES.cfg
@@ -91,4 +91,10 @@ FILES = [
     'arch': ['32bit'],
     'buildtype': ['official'],
   },
+  # PDF Plugin files:
+  {
+    'filename': 'libpdf.so',
+    'arch': ['32bit', '64bit'],
+    'buildtype': ['dev', 'official'],
+  },
 ]
diff --git a/chrome/tools/build/win/FILES b/chrome/tools/build/win/FILES
index 03f37c4..ada0721 100644
--- a/chrome/tools/build/win/FILES
+++ b/chrome/tools/build/win/FILES
@@ -62,3 +62,4 @@ resources
 wow_helper.exe
 gcswf32.dll
 plugin.vch
+pdf.dll
\ No newline at end of file
diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg
index 8b76549..609596e 100644
--- a/chrome/tools/build/win/FILES.cfg
+++ b/chrome/tools/build/win/FILES.cfg
@@ -336,4 +336,10 @@ FILES = [
     'arch': ['32bit', '64bit'],
     'buildtype': ['official'],
   },
+  # PDF Plugin files:
+  {
+    'filename': 'pdf.dll',
+    'arch': ['32bit', '64bit'],
+    'buildtype': ['dev', 'official'],
+  },
 ]