Revert "Revert "media: Move widevine CDM targets to WidevineCdm folder""

media/cdm_paths.gypi

Index: media/cdm_paths.gypi
diff --git a/media/cdm_paths.gypi b/media/cdm_paths.gypi
new file mode 100644
index 0000000000000000000000000000000000000000..e0a128f974d895c91a998756bb41e81d06f28952
--- /dev/null
+++ b/media/cdm_paths.gypi
@@ -0,0 +1,56 @@
+# Copyright 2016 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.
+
+# Common variables for media CDM.
+
+# Naming and folder structure below are following the recommendation for chrome
+# components. Component-updated CDMs must following the same recommendation.
+
+# Note: This file must be in sync with cdm_paths.cc
+# TODO(xhwang): Auto generate paths in C++ from build variables so we don't
+# need this note.
+
+# GN version: //media/cdm/ppapi/cdm_paths.gni
+{
+  'variables': {
+    'variables': {
+      'conditions': [
+        # OS name for components is close to "<(OS)" but has some differences.
+        # Explicitly define what we use to avoid confusion.
+        ['OS == "linux" and chromeos == 1', {
+          'component_os%': 'cros'
+        }, 'OS == "linux"', {
+          'component_os%': 'linux'
+        }, 'OS == "win"', {
+          'component_os%': 'win'
+        }, 'OS == "mac"', {
+          'component_os%': 'mac'
+        }, {
+          'component_os%': '<(OS)'
+        }],
+        # Architecture name for components is close to "<(current_cpu)" but has
+        # some differences. Explicitly define what we use to avoid confusion.
+        ['target_arch == "ia32"', {
+          'component_arch%': 'x86'
+        }, 'target_arch == "x64"', {
+          'component_arch%': 'x64'
+        }, 'target_arch == "arm"', {
+          'component_arch%': 'arm'
+        }, {
+          'component_arch%': '<(current_cpu)'
+        }],
+      ],
+    },
+    'conditions' : [
+      ['OS == "win" or OS == "mac"', {
+        # Path of Clear Key and Widevine CDMs relative to the output dir.
+        'widevine_cdm_path%': 'WidevineCdm/_platform_specific/<(component_os)_<(component_arch)',
+        'clearkey_cdm_path%': 'ClearKeyCdm/_platform_specific/<(component_os)_<(component_arch)',
+      }, {
+        'widevine_cdm_path%': '.',
+        'clearkey_cdm_path%': '.',
+      }],
+    ]
+  },
+}