(reland) media: Use platform specific folders for CDMs

chrome/installer/linux/BUILD.gn

 # Copyright 2015 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("//build/config/sanitizers/sanitizers.gni")
 import("//build/util/version.gni")
 import("//chrome/version.gni")
 
+if (current_cpu == "x86" || current_cpu == "x64") {
+  import("//media/cdm/ppapi/cdm_paths.gni")
+}
+
 assert(is_linux && is_chrome_branded)
 
 # This target builds all "normal" Linux installers.
 # GYP version: chrome/chrome_installer.gypi:linux_packages_all
 #
 # The bot setup is to build stable, unstable, and beta packages for the current
 # build. Then a later step picks up the package corresponding to what the
 # current build is supposed to be. This is wasteful since one build will only
 # be one of these. This build file also has targets for trunk and possibly asan
 # installers.
@@ skipping 192 matching lines @@
 
     "$root_out_dir/nacl_helper",
     "$root_out_dir/nacl_helper_bootstrap",
     "$root_out_dir/PepperFlash/libpepflashplayer.so",
     "$root_out_dir/PepperFlash/manifest.json",
   ]
 
   if (current_cpu == "x86") {
     packaging_files_binaries += [
       "$root_out_dir/nacl_irt_x86_32.nexe",
-      "$root_out_dir/libwidevinecdmadapter.so",
-      "$root_out_dir/libwidevinecdm.so",
+      "$root_out_dir/$widevine_cdm_path/libwidevinecdmadapter.so",
+      "$root_out_dir/$widevine_cdm_path/libwidevinecdm.so",
     ]
   } else if (current_cpu == "x64") {
     packaging_files_binaries += [
       "$root_out_dir/nacl_irt_x86_64.nexe",
-      "$root_out_dir/libwidevinecdmadapter.so",
-      "$root_out_dir/libwidevinecdm.so",
+      "$root_out_dir/$widevine_cdm_path/libwidevinecdmadapter.so",
+      "$root_out_dir/$widevine_cdm_path/libwidevinecdm.so",
     ]
   } else if (current_cpu == "arm") {
     packaging_files_binaries += [ "$root_out_dir/nacl_irt_arm.nexe" ]
   }
   if (is_asan) {
     packaging_files_binaries += [ "$root_out_dir/lib/libc++.so" ]
   }
 
   deb_target_name = "${target_name}_deb"
   action(deb_target_name) {
@@ skipping 99 matching lines @@
 # Other packages that we support that aren't included in the default "linux"
 # target.
 linux_package("trunk") {
   channel = "trunk"
 }
 if (is_asan) {
   linux_package("asan") {
     channel = "asan"
   }
 }