media: Move widevine CDM targets to WidevineCdm folder

chrome/browser_tests.isolate

 # 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.
 {
   'conditions': [
     ['use_x11==0', {
       'variables': {
         'command': [
           '../testing/test_env.py',
           '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
@@ skipping 17 matching lines @@
         ],
         'files': [
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
     ['OS=="linux"', {
       'variables': {
         'files': [
           '<(PRODUCT_DIR)/libclearkeycdm.so',

[ddorwin, 2016/05/06 22:23:48]

To ensure ECK is as similar as possible to production CDMs, shouldn't it also be
in a subdirectory (with a manifest.json)?

[xhwang, 2016/05/09 20:59:02]

Done for the subdirectory.

Currently we are registering the clear key cdm in commandline, so we can't
really use manifest.json. In the future when we use a command flag to enable
clear key cdm, we would be able to use a manifest.json.

           '<(PRODUCT_DIR)/libclearkeycdmadapter.so',
           '<(PRODUCT_DIR)/libpower_saver_test_plugin.so',
           '<(PRODUCT_DIR)/libppapi_tests.so',
         ],
       },
     }],
     ['OS=="linux" and branding=="Chrome" and enable_pepper_cdms==1', {
       'variables': {
         'files': [
-          '<(PRODUCT_DIR)/libwidevinecdm.so',
-          '<(PRODUCT_DIR)/libwidevinecdmadapter.so',
+          '<(PRODUCT_DIR)/WidevineCdm/libwidevinecdm.so',
+          '<(PRODUCT_DIR)/WidevineCdm/libwidevinecdmadapter.so',
         ],
       },
     }],
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'files': [
           '../content/test/data/',
           '../google_apis/test/',
           '../media/test/data/',
           '../media/test/data/',
@@ skipping 128 matching lines @@
           '<(PRODUCT_DIR)/libclearkeycdm.dylib',
           '<(PRODUCT_DIR)/osmesa.so',
           '<(PRODUCT_DIR)/power_saver_test_plugin.plugin/Contents/MacOS/power_saver_test_plugin',
           '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests',
         ],
       },
     }],
     ['OS=="mac" and branding=="Chrome" and enable_pepper_cdms==1', {
       'variables': {
         'files': [
-          '<(PRODUCT_DIR)/libwidevinecdm.dylib',
-          '<(PRODUCT_DIR)/widevinecdmadapter.plugin',
+          '<(PRODUCT_DIR)/WidevineCdm/libwidevinecdm.dylib',
+          '<(PRODUCT_DIR)/WidevineCdm/widevinecdmadapter.plugin',
         ],
       },
     }],
     ['OS=="win"', {
       'variables': {
         'files': [
           '../native_client/build/build_nexe.py',
           '<(PRODUCT_DIR)/chrome_elf.dll',
           '<(PRODUCT_DIR)/clearkeycdm.dll',
           '<(PRODUCT_DIR)/clearkeycdmadapter.dll',
           '<(PRODUCT_DIR)/crashpad_handler.exe',
           '<(PRODUCT_DIR)/power_saver_test_plugin.dll',
           '<(PRODUCT_DIR)/ppapi_tests.dll',
           'tools/build/repack_locales.py',
         ],
       },
     }],
     ['OS=="win" and branding=="Chrome" and enable_pepper_cdms==1', {
       'variables': {
         'files': [
-          '<(PRODUCT_DIR)/widevinecdm.dll',
-          '<(PRODUCT_DIR)/widevinecdmadapter.dll',
+          '<(PRODUCT_DIR)/WidevineCdm/widevinecdm.dll',
+          '<(PRODUCT_DIR)/WidevineCdm/widevinecdmadapter.dll',
         ],
       },
     }],
     ['OS=="win" and target_arch=="ia32"', {
       'variables': {
         'files': [
           '<(PRODUCT_DIR)/wow_helper.exe',
         ],
       },
     }],
@@ skipping 34 matching lines @@
           'browser/chromeos/login/test/https_forwarder.py',
         ],
       },
     }],
   ],
   'includes': [
     '../base/base.isolate',
     'chrome.isolate',
   ],
 }