Revert of media: Move widevine CDM targets to WidevineCdm folder

media/cdm/ppapi/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/features.gni")
 import("//chrome/version.gni")  # TODO layering violation!
 import("//media/cdm/ppapi/ppapi_cdm_adapter.gni")
 import("//media/media_options.gni")
 
 # The GYP version supports build flags "use_fake_video_decoder" and
 # "use_vpx". These should be added here if necessary but its not clear if
 # they are required any more.
 shared_library("clearkeycdm") {
-  output_dir = "$root_out_dir/ClearKeyCdm"
   sources = [
     "cdm_file_io_test.cc",
     "cdm_file_io_test.h",
     "external_clear_key/cdm_video_decoder.cc",
     "external_clear_key/cdm_video_decoder.h",
     "external_clear_key/clear_key_cdm.cc",
     "external_clear_key/clear_key_cdm.h",
     "external_clear_key/clear_key_cdm_common.h",
   ]
 
@@ skipping 31 matching lines @@
   visibility = [ ":*" ]
   template_file = chrome_version_rc_template
   sources = [
     "//media/clearkeycdmadapter.ver",
     "external_clear_key/BRANDING",
   ]
   output = "$target_gen_dir/clearkeycdmadapter_version.rc"
 }
 
 ppapi_cdm_adapter("clearkeycdmadapter") {
-  output_dir = "$root_out_dir/ClearKeyCdm"
-
   # Check whether the plugin's origin URL is valid.
   defines = [ "CHECK_DOCUMENT_URL" ]
   deps = [
     ":clearkeycdm",
     ":clearkeycdmadapter_resources",
     "//base",  # Required for the allocator implementation.
     "//media:shared_memory_support",
     "//ui/gfx/geometry",
   ]
 }