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

Side by Side Diff: media/cdm/cdm_paths.cc

Issue 2048523002: Fix base::GetNativeLibraryName() for Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@native_lib_clean
Patch Set: rebase Created 4 years, 6 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 unified diff | Download patch
« no previous file with comments | « media/cdm/cdm_paths.h ('k') | media/cdm/external_clear_key_test_helper.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/cdm/cdm_paths.h" 5 #include "media/cdm/cdm_paths.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 10
11 namespace media { 11 namespace media {
12 12
13 // Name of the ClearKey CDM library.
14 const char kClearKeyCdmLibraryName[] = "clearkeycdm";
15
13 // Note: This file must be in sync with cdm_paths.{gypi|gni} 16 // Note: This file must be in sync with cdm_paths.{gypi|gni}
14 // TODO(xhwang): Improve how we enable platform specific path. See 17 // TODO(xhwang): Improve how we enable platform specific path. See
15 // http://crbug.com/468584 18 // http://crbug.com/468584
16 #if (defined(OS_MACOSX) || defined(OS_WIN)) && \ 19 #if (defined(OS_MACOSX) || defined(OS_WIN)) && \
17 (defined(ARCH_CPU_X86) || defined(ARCH_CPU_X86_64)) 20 (defined(ARCH_CPU_X86) || defined(ARCH_CPU_X86_64))
18 #define CDM_USE_PLATFORM_SPECIFIC_PATH 21 #define CDM_USE_PLATFORM_SPECIFIC_PATH
19 #endif 22 #endif
20 23
21 #if defined(CDM_USE_PLATFORM_SPECIFIC_PATH) 24 #if defined(CDM_USE_PLATFORM_SPECIFIC_PATH)
22 25
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 63
61 #else // defined(CDM_USE_PLATFORM_SPECIFIC_PATH) 64 #else // defined(CDM_USE_PLATFORM_SPECIFIC_PATH)
62 65
63 base::FilePath GetPlatformSpecificDirectory(const std::string& cdm_base_path) { 66 base::FilePath GetPlatformSpecificDirectory(const std::string& cdm_base_path) {
64 return base::FilePath(); 67 return base::FilePath();
65 } 68 }
66 69
67 #endif // defined(CDM_USE_PLATFORM_SPECIFIC_PATH) 70 #endif // defined(CDM_USE_PLATFORM_SPECIFIC_PATH)
68 71
69 } // namespace media 72 } // namespace media
OLDNEW
« no previous file with comments | « media/cdm/cdm_paths.h ('k') | media/cdm/external_clear_key_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698