Revert of Fix build of Widevine CDM stub on Mac

third_party/widevine/cdm/widevine_cdm.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     # Allow widevinecdmadapter to be built in Chromium.
     'variables': {
       'enable_widevine%': 0,
     },
@@ skipping 161 matching lines @@
       'conditions': [
         [ 'widevine_cdm_manifest_file != []', {
           'copies': [{
             'destination': '<(PRODUCT_DIR)/WidevineCdm',
             'files': [ '<(widevine_cdm_manifest_file)' ],
           }],
         }],
       ],
     },
     {
-      'target_name': 'widevinecdm_binary',
-      'product_name': 'widevinecdm',
-      'type': 'none',
-      'conditions': [
-        ['os_posix == 1 and OS != "mac"', {
-          'type': 'loadable_module',
-        }],
-        ['OS == "mac" or OS == "win"', {
-          'type': 'shared_library',
-        }],
-        ['OS == "mac"', {
-          'xcode_settings': {
-            'DYLIB_INSTALL_NAME_BASE': '@loader_path',
-          },
-        }, {
-          # Put Widevine CDM in the correct path directly except
-          # for mac. On mac strip_save_dsym doesn't work with product_dir
-          # so we rely on the "widevinecdm" target to copy it over.
-          # See http://crbug.com/611990
-          'product_dir': '<(PRODUCT_DIR)/<(widevine_cdm_path)',
-        }],
-      ],
-      'defines': ['CDM_IMPLEMENTATION'],
-      'dependencies': [
-        'widevine_cdm_version_h',
-        '<(DEPTH)/base/base.gyp:base',
-      ],
-      'sources': [
-        '<(DEPTH)/media/cdm/stub/stub_cdm.cc',
-        '<(DEPTH)/media/cdm/stub/stub_cdm.h',
-      ],
-    },
-    {
       # GN version: //third_party/widevine/cdm:widevinecdm
       'target_name': 'widevinecdm',
       'type': 'none',
       'conditions': [
         [ 'branding == "Chrome"', {
           'conditions': [
             [ 'OS=="mac"', {
               'xcode_settings': {
                 'COPY_PHASE_STRIP': 'NO',
               }
             }],
           ],
           'copies': [{
             'destination': '<(PRODUCT_DIR)/<(widevine_cdm_path)',
             'files': [ '<@(widevine_cdm_binary_files)' ],
           }],
         }],
         [ 'branding != "Chrome" and enable_widevine == 1', {
-          # On Mac this copies the widevinecdm binary to <(widevine_cdm_path).
-          # On other platforms the binary is already in <(widevine_cdm_path).
-          # See "widevinecdm_binary" above.
+          'product_dir': '<(PRODUCT_DIR)/<(widevine_cdm_path)',
+          'conditions': [
+            ['os_posix == 1 and OS != "mac"', {
+              'type': 'loadable_module',
+              # This causes the binary to be put in
+              # <(PRODUCT_DIR)/<(widevine_cdm_path) instead of lib/.
+              # This matches what happens in the copy step above.
+            }],
+            ['OS == "mac" or OS == "win"', {
+              'type': 'shared_library',
+            }],
+            ['OS == "mac"', {
+              'xcode_settings': {
+                'DYLIB_INSTALL_NAME_BASE': '@loader_path',
+              },
+            }],
+          ],
+          'defines': ['CDM_IMPLEMENTATION'],
           'dependencies': [
-            'widevinecdm_binary',
+            'widevine_cdm_version_h',
+            '<(DEPTH)/base/base.gyp:base',
           ],
-          'conditions': [
-            ['OS == "mac"', {
-              'copies': [{
-                'destination': '<(PRODUCT_DIR)/<(widevine_cdm_path)',
-                'files': [ '<(PRODUCT_DIR)/libwidevinecdm.dylib' ],
-              }],
-            }],
+          'sources': [
+            '<(DEPTH)/media/cdm/stub/stub_cdm.cc',
+            '<(DEPTH)/media/cdm/stub/stub_cdm.h',
           ],
         }],
       ],
     },
     {
       # GN version: //third_party/widevine/cdm:widevine_test_license_server
       'target_name': 'widevine_test_license_server',
       'type': 'none',
       'conditions': [
         [ 'branding == "Chrome" and OS == "linux"', {
           'dependencies': [
             '<(DEPTH)/third_party/widevine/test/license_server/license_server.gyp:test_license_server',
           ],
         }],
       ],
     },
   ],
 }