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

5 files changed, 15 insertions, 39 deletions

diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 8891d27..eb7fcc3 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -282,6 +282,9 @@
                 'app/chrome_main_mac.mm',
                 'app/chrome_main_mac.h',
               ],
+              'dependencies': [
+                '../pdf/pdf.gyp:pdf',
+              ],
               'include_dirs': [
                 '<(grit_out_dir)',
               ],
@@ -319,11 +322,6 @@
                     '../components/components.gyp:breakpad_stubs',
                   ],
                 }],  # mac_breakpad_compiled_in
-                ['internal_pdf', {
-                  'dependencies': [
-                    '../pdf/pdf.gyp:pdf',
-                  ],
-                }],
               ],  # conditions
             }],  # OS=="mac"
           ],  # conditions
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',
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index c0fe832..2ec9dca 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -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',
-              ],
-              '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
+                '../pdf/pdf.gyp:pdf_linux_symbols',
               ],
-            }], # 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
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi
index a2dabf6..fad6b8c 100644
--- a/chrome/chrome_installer.gypi
+++ b/chrome/chrome_installer.gypi
@@ -495,6 +495,7 @@
           '<(PRODUCT_DIR)/chrome',
           '<(PRODUCT_DIR)/chrome_sandbox',
           '<(PRODUCT_DIR)/libffmpegsumo.so',
+          '<(PRODUCT_DIR)/libpdf.so',
           '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so',
           '<(PRODUCT_DIR)/xdg-mime',
           '<(PRODUCT_DIR)/xdg-settings',
@@ -541,11 +542,6 @@
             'deb_arch': 'arm',
             'rpm_arch': 'arm',
           }],
-          ['internal_pdf', {
-            'packaging_files_binaries': [
-              '<(PRODUCT_DIR)/libpdf.so',
-            ],
-          }],
           ['libpeer_target_type!="static_library"', {
             'packaging_files_binaries': [
               '<(PRODUCT_DIR)/lib/libpeerconnection.so',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index a9e4a35..9ca59af 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1770,11 +1770,6 @@
             ['exclude', '^browser/captive_portal/'],
           ],
         }],
-        ['internal_pdf', {
-          'dependencies': [
-            '../pdf/pdf.gyp:pdf',
-          ],
-        }],
         ['enable_webrtc==0', {
           'sources!': [
             'browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc',