Revert of media: Use platform specific folders for CDMs

third_party/widevine/cdm/BUILD.gn

Index: third_party/widevine/cdm/BUILD.gn
diff --git a/third_party/widevine/cdm/BUILD.gn b/third_party/widevine/cdm/BUILD.gn
index 5d98b3653dfa6fa65a3b14855d0bf93778dc9d2b..e2093a58849f6d0cc6965b2e50b158468e05b35a 100644
--- a/third_party/widevine/cdm/BUILD.gn
+++ b/third_party/widevine/cdm/BUILD.gn
@@ -5,7 +5,6 @@
 import("//build/config/chrome_build.gni")
 import("//build/config/features.gni")
 import("//chrome/version.gni")  # TODO layering violation
-import("//media/cdm/ppapi/cdm_paths.gni")
 import("//media/cdm/ppapi/ppapi_cdm_adapter.gni")
 import("//third_party/widevine/cdm/widevine.gni")
 
@@ -68,7 +67,7 @@
   copy("widevinecdm") {
     sources = widevine_cdm_binary_files
     outputs = [
-      "$root_out_dir/$widevine_cdm_path/{{source_file_part}}",
+      "$root_out_dir/{{source_file_part}}",
     ]
 
     # TODO(jrummell)
@@ -78,7 +77,6 @@
   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/$widevine_cdm_path"
     sources = [
       "//media/cdm/stub/stub_cdm.cc",
       "//media/cdm/stub/stub_cdm.h",
@@ -126,7 +124,6 @@
 
   ppapi_cdm_adapter("widevinecdmadapter") {
     defines = []
-    output_dir = "$root_out_dir/$widevine_cdm_path"
     deps = [
       ":version_h",
       ":widevinecdm",
@@ -135,16 +132,13 @@
 
     if (is_linux) {
       ldflags =
-          [ rebase_path("$root_out_dir/$widevine_cdm_path/libwidevinecdm.so",
-                        root_build_dir) ]
+          [ rebase_path("$root_out_dir/libwidevinecdm.so", root_build_dir) ]
     } else if (is_win) {
       ldflags =
-          [ rebase_path("$root_out_dir/$widevine_cdm_path/widevinecdm.dll.lib",
-                        root_build_dir) ]
+          [ rebase_path("$root_out_dir/widevinecdm.dll.lib", root_build_dir) ]
     } else if (is_mac) {
       ldflags =
-          [ rebase_path("$root_out_dir/$widevine_cdm_path/libwidevinecdm.dylib",
-                        root_build_dir) ]
+          [ rebase_path("$root_out_dir/libwidevinecdm.dylib", root_build_dir) ]
     }
   }
 } else {