Fix linking issue with CDM plugin wrapper and pre-built CDM.

third_party/widevine/cdm/widevine_cdm.gyp

Index: third_party/widevine/cdm/widevine_cdm.gyp
diff --git a/third_party/widevine/cdm/widevine_cdm.gyp b/third_party/widevine/cdm/widevine_cdm.gyp
index 8394954d66624eb3c9d9ba313e33f2ebf5dc630b..78aac740ecffb578a72011a2b650a4e910593fd0 100644
--- a/third_party/widevine/cdm/widevine_cdm.gyp
+++ b/third_party/widevine/cdm/widevine_cdm.gyp
@@ -14,7 +14,7 @@
                 'symbols/chromeos/<(target_arch)/widevine_cdm_version.h',
             'widevine_cdm_binary_files%': [
               'binaries/chromeos/<(target_arch)/libwidevinecdm.so',
-              'binaries/chromeos/<(target_arch)/manifest.json',
+              #'binaries/chromeos/<(target_arch)/manifest.json',
             ],
           }],
           [ 'OS == "linux" and chromeos == 0', {
@@ -22,7 +22,7 @@
                 'symbols/linux/<(target_arch)/widevine_cdm_version.h',
             'widevine_cdm_binary_files%': [
               'binaries/linux/<(target_arch)/libwidevinecdm.so',
-              'binaries/linux/<(target_arch)/manifest.json',
+              #'binaries/linux/<(target_arch)/manifest.json',
             ],
           }],
           [ 'OS == "mac"', {
@@ -30,7 +30,7 @@
                 'symbols/mac/<(target_arch)/widevine_cdm_version.h',
             'widevine_cdm_binary_files%': [
               'binaries/mac/<(target_arch)/libwidevinecdm.dylib',
-              'binaries/mac/<(target_arch)/manifest.json',
+              #'binaries/mac/<(target_arch)/manifest.json',
             ],
           }],
           [ 'OS == "win"', {
@@ -38,7 +38,7 @@
                 'symbols/win/<(target_arch)/widevine_cdm_version.h',
             'widevine_cdm_binary_files%': [
               'binaries/win/<(target_arch)/widevinecdm.dll',
-              'binaries/win/<(target_arch)/manifest.json',
+              #'binaries/win/<(target_arch)/manifest.json',

[Ami GONE FROM CHROMIUM, 2012/10/23 05:52:39]

lolwat?  You want to check this in this way?  You think the CL description
adequately describes what you're doing? :)

[ddorwin, 2012/10/23 15:48:33]

Done.

             ],
           }],
         ],
@@ -71,7 +71,11 @@
               # remove it.

[Ami GONE FROM CHROMIUM, 2012/10/23 05:52:39]

Can you point to an upstream compiler (MSVC/gcc/clang) bug?

[ddorwin, 2012/10/23 15:48:33]

This was copied from ppapi. It dates back to
https://code.google.com/p/ppapi/source/detail?r=2. We'll see if it's necessary
for this code.
Done.

               'cflags!': ['-gstabs'],
               # Allow the plugin wrapper to find the CDM in the same directory.
-              'ldflags': ['-Wl,-rpath=\$$ORIGIN']
+              'ldflags': ['-Wl,-rpath=\$$ORIGIN'],
+              'libraries': [
+                # Copied by widevine_cdm_binaries.
+                '<(PRODUCT_DIR)/libwidevinecdm.so',
+              ],
             }],
             [ 'OS == "win" and 0', {
               'type': 'shared_library',
@@ -104,7 +108,8 @@
       'target_name': 'widevine_cdm_binaries',
       'type': 'none',
       'copies': [{
-        # TODO(ddorwin): Do we need a sub-directory?
+        # TODO(ddorwin): Do we need a sub-directory? We either need a
+        # sub-directory or to rename manifest.json before we can copy it.
         'destination': '<(PRODUCT_DIR)',
         'files': [ '<@(widevine_cdm_binary_files)' ],
       }],