Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(409)

Unified Diff: media/cdm/ppapi/cdm_paths.gni

Issue 2001953002: Revert of media: Use platform specific folders for CDMs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/cdm/ppapi/BUILD.gn ('k') | media/cdm_paths.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/ppapi/cdm_paths.gni
diff --git a/media/cdm/ppapi/cdm_paths.gni b/media/cdm/ppapi/cdm_paths.gni
deleted file mode 100644
index 3d166d004eb9c5cf656b9dbcb1fa7cf3d173d3d2..0000000000000000000000000000000000000000
--- a/media/cdm/ppapi/cdm_paths.gni
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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.
-
-# This file defines output paths for the CDM adapters and CDMs.
-
-# Naming and folder structure below are following the recommendation for Chrome
-# components. Component-updated CDMs must follow the same recommendation.
-
-# Note: This file must be in sync with cdm_paths.cc
-
-# OS name for components is close to "target_os" but has some differences.
-# Explicitly define what we use to avoid confusion.
-if (is_chromeos) {
- component_os = "cros"
-} else if (is_linux) {
- component_os = "linux"
-} else if (is_win) {
- component_os = "win"
-} else if (is_mac) {
- component_os = "mac"
-} else {
- component_os = "$target_os"
-}
-
-# Only enable platform specific path for Win and Mac, where CDMs are Chrome
-# components.
-# TODO(xhwang): Improve how we enable platform specific path. See
-# http://crbug.com/468584
-if (is_win || is_mac) {
- # Architecture name for components is the same as "<(target_cpu)".
- _platform_specific_path =
- "_platform_specific/$component_os" + "_" + "$target_cpu"
-
- # Path of Clear Key and Widevine CDMs relative to the output dir.
- clearkey_cdm_path = "ClearKeyCdm/$_platform_specific_path"
- widevine_cdm_path = "WidevineCdm/$_platform_specific_path"
-} else {
- clearkey_cdm_path = "."
- widevine_cdm_path = "."
-}
« no previous file with comments | « media/cdm/ppapi/BUILD.gn ('k') | media/cdm_paths.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698