Fixed ExternalClearKey/EncryptedMediaTest on Linux ASAN and Chromium OS ASAN.

These build bots zip up binaries to be run on other bots. They exclude lib/, so any test dependencies must be in PRODUCT_DIR. For shared objects, this means using loadable_module. To get the link dependencies correct, an explicit 'libraries' entry is required.

Also removed the hopefully unnecessary -gstabs removal.

BUG=153231
TEST=ExternalClearKey/EncryptedMediaTest tests pass on Linux ASAN and Chromium OS ASAN bots.

Review URL: https://chromiumcodereview.appspot.com/11266002

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

1 files changed, 15 insertions, 9 deletions

diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi
index ccfda20..ba24b41 100644
--- a/webkit/media/webkit_media.gypi
+++ b/webkit/media/webkit_media.gypi
@@ -83,7 +83,7 @@
         'webvideoframe_impl.h',
       ],
       'conditions': [
-        ['inside_chromium_build==0', {
+        ['inside_chromium_build == 0', {
           'dependencies': [
             '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
           ],
@@ -111,7 +111,7 @@
     },
     {
       'target_name': 'clearkeycdm',
-      'type': 'shared_library',
+      'type': 'none',
       'conditions': [
         ['use_ffmpeg == 1' , {
           'defines': ['CLEAR_KEY_CDM_USE_FFMPEG_DECODER'],
@@ -123,6 +123,11 @@
             'crypto/ppapi/ffmpeg_cdm_video_decoder.h',
           ],
         }],
+        ['os_posix == 1 and OS != "mac"', {
+          'type': 'loadable_module',  # Must be in PRODUCT_DIR for ASAN bots.
+        }, {  # 'os_posix != 1 or OS == "mac"'
+          'type': 'shared_library',
+        }],
       ],
       'defines': ['CDM_IMPLEMENTATION'],
       'dependencies': [
@@ -147,19 +152,20 @@
         'crypto/ppapi/linked_ptr.h',
       ],
       'conditions': [
-        ['os_posix==1 and OS!="mac"', {
+        ['os_posix == 1 and OS != "mac"', {
           'cflags': ['-fvisibility=hidden'],
           'type': 'loadable_module',
-          # -gstabs, used in the official builds, causes an ICE. Simply remove
-          # it.
-          'cflags!': ['-gstabs'],
           # Allow the plugin wrapper to find the CDM in the same directory.
-          'ldflags': ['-Wl,-rpath=\$$ORIGIN']
+          'ldflags': ['-Wl,-rpath=\$$ORIGIN'],
+          'libraries': [
+            # Built by clearkeycdm.
+            '<(PRODUCT_DIR)/libclearkeycdm.so',
+          ],
         }],
-        ['OS=="win"', {
+        ['OS == "win"', {
           'type': 'shared_library',
         }],
-        ['OS=="mac"', {
+        ['OS == "mac"', {
           'type': 'loadable_module',
           'mac_bundle': 1,
           'product_extension': 'plugin',