media: Use platform specific folders for CDMs

media/cdm/cdm_paths.cc

+// 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.
+
+#include "media/cdm/cdm_paths.h"
+
+#include <string>
+
+#include "build/build_config.h"
+
+namespace media {
+
+// Note: This file must be in sync with cdm_paths.{gypi|gni}
+// TODO(xhwang): Auto generate paths from build variables so we don't need this

[ddorwin, 2016/05/20 04:08:56]

Do you still plan to do this?
Alternatively, you could refer to
https://bugs.chromium.org/p/chromium/issues/detail?id=468584.

[xhwang, 2016/05/20 07:18:19]

Done.

+// note.
+#if defined(OS_MACOSX) || defined(OS_WIN)
+#define CDM_USE_PLATFORM_SPECIFIC_PATH
+#endif
+
+#if defined(CDM_USE_PLATFORM_SPECIFIC_PATH)
+
+// Special path used in chrome components.
+const char kPlatformSpecific[] = "_platform_specific";
+
+// Name of the component platform in the manifest.
+const char kComponentPlatform[] =
+#if defined(OS_MACOSX)
+    "mac";
+#elif defined(OS_WIN)
+    "win";
+#elif defined(OS_CHROMEOS)
+    "chromeos";
+#elif defined(OS_LINUX)
+    "linux";
+#else
+    "unsupported_platform";
+#endif
+
+// Name of the component architecture in the manifest.
+const char kComponentArch[] =
+#if defined(ARCH_CPU_X86)
+    "x86";
+#elif defined(ARCH_CPU_X86_64)
+    "x64";
+#elif defined(ARCH_CPU_ARMEL)
+    "arm";
+#else
+    "unsupported_arch";
+#endif
+
+// TODO(xhwang): Use this function in Widevine CDM component installer.

[ddorwin, 2016/05/20 04:08:56]

You probably don't need this in both files.

[xhwang, 2016/05/20 07:18:19]

Done.

+base::FilePath GetPlatformSpecificDirectory(const std::string& cdm_base_path) {
+  base::FilePath path;
+  const std::string kPlatformArch =
+      std::string(kComponentPlatform) + "_" + kComponentArch;
+  return path.AppendASCII(cdm_base_path)
+      .AppendASCII(kPlatformSpecific)
+      .AppendASCII(kPlatformArch);
+}
+
+#else  // defined(CDM_USE_PLATFORM_SPECIFIC_PATH)
+
+base::FilePath GetPlatformSpecificDirectory(const std::string& cdm_base_path) {
+  return base::FilePath();
+}
+
+#endif  // defined(CDM_USE_PLATFORM_SPECIFIC_PATH)
+
+}  // namespace media