Revert of media: Move widevine CDM targets to WidevineCdm folder

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,
     },
     'enable_widevine%': '<(enable_widevine)',
     'widevine_cdm_version_h_file%': 'widevine_cdm_version.h',
-    # TODO(xhwang): Also include manifest.json.
     'widevine_cdm_binary_files%': [],
     'conditions': [
       [ 'branding == "Chrome"', {
         'conditions': [
           [ 'chromeos == 1', {
             'widevine_cdm_version_h_file%':
                 'chromeos/<(target_arch)/widevine_cdm_version.h',
             'widevine_cdm_binary_files%': [
               'chromeos/<(target_arch)/libwidevinecdm.so',
             ],
@@ skipping 56 matching lines @@
       'sources': [
         'widevinecdmadapter.ver',
       ],
       'includes': [
         '../../../chrome/version_resource_rules.gypi',
       ],
     },
     {
       # GN version: //third_party/widevine/cdm:widevinecdmadapter
       'target_name': 'widevinecdmadapter',
-      'product_dir': '<(PRODUCT_DIR)/WidevineCdm',
       'type': 'none',
       'conditions': [
         [ '(branding == "Chrome" or enable_widevine == 1) and enable_pepper_cdms == 1', {
           'dependencies': [
             '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp',
             '<(DEPTH)/media/media_cdm_adapter.gyp:cdmadapter',
             'widevine_cdm_version_h',
             'widevinecdm',
             'widevinecdmadapter_resources',
           ],
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/widevinecdmadapter_version.rc',
           ],
           'conditions': [
             [ 'os_posix == 1 and OS != "mac"', {
               'libraries': [
                 '-lrt',
                 # Copied/created by widevinecdm.
-                '<(PRODUCT_DIR)/WidevineCdm/libwidevinecdm.so',
+                '<(PRODUCT_DIR)/libwidevinecdm.so',
               ],
             }],
             [ 'OS == "win"', {
               'libraries': [
                 # Copied/created by widevinecdm.
-                '<(PRODUCT_DIR)/WidevineCdm/widevinecdm.dll.lib',
+                '<(PRODUCT_DIR)/widevinecdm.dll.lib',
               ],
             }],
             [ 'OS == "mac"', {
               'libraries': [
                 # Copied/created by widevinecdm.
-                '<(PRODUCT_DIR)/WidevineCdm/libwidevinecdm.dylib',
+                '<(PRODUCT_DIR)/libwidevinecdm.dylib',
               ],
             }],
           ],
         }],
       ],
     },
     {
       # GN version: //third_party/widevine/cdm:version_h
       'target_name': 'widevine_cdm_version_h',
       'type': 'none',
       'copies': [{
         'destination': '<(SHARED_INTERMEDIATE_DIR)',
         'files': [ '<(widevine_cdm_version_h_file)' ],
       }],
     },
     {
       # 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)/WidevineCdm',
+            # 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)' ],
           }],
         }],
         [ 'branding != "Chrome" and enable_widevine == 1', {
-          'product_dir': '<(PRODUCT_DIR)/WidevineCdm',
           'conditions': [
             ['os_posix == 1 and OS != "mac"', {
               'type': 'loadable_module',
-              # This causes the binary to be put in <(PRODUCT_DIR)/WidevineCdm
+              # Note that this causes the binary to be put in PRODUCT_DIR
               # 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',
               },
@@ skipping 18 matching lines @@
       'conditions': [
         [ 'branding == "Chrome" and OS == "linux"', {
           'dependencies': [
             '<(DEPTH)/third_party/widevine/test/license_server/license_server.gyp:test_license_server',
           ],
         }],
       ],
     },
   ],
 }