Revert of media: Move widevine CDM targets to WidevineCdm folder

third_party/widevine/cdm/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/features.gni")
 import("//chrome/version.gni")  # TODO layering violation
 import("//media/cdm/ppapi/ppapi_cdm_adapter.gni")
 import("//third_party/widevine/cdm/widevine.gni")
 
@@ skipping 49 matching lines @@
   outputs = [
     "$root_gen_dir/widevine_cdm_version.h",
   ]
 }
 
 # GYP version: third_party/widevine/cdm/widevine_cdm.gyp:widevinecdm
 if (widevine_cdm_binary_files != []) {
   copy("widevinecdm") {
     sources = widevine_cdm_binary_files
     outputs = [
-      "$root_out_dir/WidevineCdm/{{source_file_part}}",
+      "$root_out_dir/{{source_file_part}}",
     ]
 
     # TODO(jrummell)
     # 'COPY_PHASE_STRIP': 'NO',
   }
 } else if (enable_widevine && enable_pepper_cdms) {
   assert(!is_chrome_branded, "Branded Chrome should have binary files to copy.")
   assert(!is_android, "Android should not have enable_pepper_cdms.")
   shared_library("widevinecdm") {
-    output_dir = "$root_out_dir/WidevineCdm"
     sources = [
       "//media/cdm/stub/stub_cdm.cc",
       "//media/cdm/stub/stub_cdm.h",
     ]
 
     defines = [ "CDM_IMPLEMENTATION" ]
 
     deps = [
       ":version_h",
       "//base",
@@ skipping 27 matching lines @@
     template_file = chrome_version_rc_template
     sources = [
       "BRANDING",
       "widevinecdmadapter.ver",
     ]
     output = "$target_gen_dir/widevinecdmadapter_version.rc"
   }
 
   ppapi_cdm_adapter("widevinecdmadapter") {
     defines = []
-    output_dir = "$root_out_dir/WidevineCdm"
     deps = [
       ":version_h",
       ":widevinecdm",
       ":widevinecdmadapter_resources",
     ]
 
     if (is_linux) {
-      ldflags = [ rebase_path("$root_out_dir/WidevineCdm/libwidevinecdm.so",
-                              root_build_dir) ]
+      ldflags =
+          [ rebase_path("$root_out_dir/libwidevinecdm.so", root_build_dir) ]
     } else if (is_win) {
-      ldflags = [ rebase_path("$root_out_dir/WidevineCdm/widevinecdm.dll.lib",
-                              root_build_dir) ]
+      ldflags =
+          [ rebase_path("$root_out_dir/widevinecdm.dll.lib", root_build_dir) ]
     } else if (is_mac) {
-      ldflags = [ rebase_path("$root_out_dir/WidevineCdm/libwidevinecdm.dylib",
-                              root_build_dir) ]
+      ldflags =
+          [ rebase_path("$root_out_dir/libwidevinecdm.dylib", root_build_dir) ]
     }
   }
 } else {
   # Placeholder when we're not compiling the adapter.
   group("widevinecdmadapter") {
   }
 }
 
 # This target exists for tests to depend on that pulls in a runtime dependency
 # on the license server.
 source_set("widevine_test_license_server") {
   if (is_chrome_branded && is_linux) {
     deps = [
       # TODO(jrummell)
       # This target should be removed and targets should have data_deps on this target:
       #"//third_party/widevine/test/license_server/license_server.gyp:test_license_server"
     ]
   }
 }