Do not use bundles for the CDM on Mac.

When using components, the CDM and adapter cannot be within the Chrome bundle.
Since the adapter is built with Chrome, the CDM cannot be within its bundle.
As a result, the adapter no longer needs to be a bundle.

The chrome_paths.cc code allows testing with the non-component path.

BUG=180260
R=xhwang@chromium.org

Review URL: https://codereview.chromium.org/14743002

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

build/landmines.py

@@ -147,6 +147,8 @@ def get_landmines(target):
     add('Compile on cc_unittests fails due to symbols removed in r185063.')
   if platform() == 'linux' and builder() == 'ninja':
     add('Builders switching from make to ninja will clobber on this.')
+  if platform() == 'mac':
+    add('Switching from bundle to unbundled dylib (issue 14743002).')
 
   return landmines
 

third_party/widevine/cdm/widevine_cdm.gyp

@@ -75,7 +75,6 @@
             }],
             [ 'OS == "mac" and 0', {
               'type': 'loadable_module',
-              'mac_bundle': 1,
               'product_extension': 'plugin',
               'libraries': [
                 # Copied by widevine_cdm_binaries.
@@ -87,16 +86,9 @@
                   '-Wl,-exported_symbol,_PPP_GetInterface',
                   '-Wl,-exported_symbol,_PPP_InitializeModule',
                   '-Wl,-exported_symbol,_PPP_ShutdownModule'
-                ]},
-              'copies': [
-                {
-                  'destination':
-                      '<(PRODUCT_DIR)/widevinecdmadapter.plugin/Contents/MacOS/',
-                  'files': [
-                    '<(PRODUCT_DIR)/libwidevinecdm.dylib',
-                  ]
-                }
-              ]
+                ],
+                'DYLIB_INSTALL_NAME_BASE': '@loader_path',
+              },
             }],
           ],
         }],

webkit/media/webkit_media.gypi

@@ -233,24 +233,16 @@
         }],
         ['OS == "mac"', {
           'type': 'loadable_module',
-          'mac_bundle': 1,
           'product_extension': 'plugin',
           'xcode_settings': {
             'OTHER_LDFLAGS': [
               # Not to strip important symbols by -Wl,-dead_strip.
               '-Wl,-exported_symbol,_PPP_GetInterface',
               '-Wl,-exported_symbol,_PPP_InitializeModule',
               '-Wl,-exported_symbol,_PPP_ShutdownModule'
-            ]},
-          'copies': [
-            {
-              'destination': '<(PRODUCT_DIR)/clearkeycdmadapter.plugin/Contents/MacOS/',
-              'files': [
-                '<(PRODUCT_DIR)/libclearkeycdm.dylib',
-                '<(PRODUCT_DIR)/ffmpegsumo.so'
-              ]
-            }
-          ]
+            ],
+            'DYLIB_INSTALL_NAME_BASE': '@loader_path',
+          },
         }],
       ],
     }