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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/cdm/cdm_paths.cc

Issue 2004253002: media: More cleanup in cdm_paths.* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: further limit where we use platform specific path 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 | « no previous file | media/cdm/ppapi/cdm_paths.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/cdm_paths.cc
diff --git a/media/cdm/cdm_paths.cc b/media/cdm/cdm_paths.cc
index b1886f9ea45e5576c575ae572f30185f018d6a24..ab9ed7d8cce844bc42dad3e9c2b11f4af8f64329 100644
--- a/media/cdm/cdm_paths.cc
+++ b/media/cdm/cdm_paths.cc
@@ -13,7 +13,8 @@ namespace media {
// Note: This file must be in sync with cdm_paths.{gypi|gni}
// TODO(xhwang): Improve how we enable platform specific path. See
// http://crbug.com/468584
-#if defined(OS_MACOSX) || defined(OS_WIN)
+#if (defined(OS_MACOSX) || defined(OS_WIN)) && \
+ (defined(ARCH_CPU_X86) || defined(ARCH_CPU_X86_64))
#define CDM_USE_PLATFORM_SPECIFIC_PATH
#endif
@@ -29,7 +30,7 @@ const char kComponentPlatform[] =
#elif defined(OS_WIN)
"win";
#elif defined(OS_CHROMEOS)
- "chromeos";
+ "cros";
#elif defined(OS_LINUX)
"linux";
#else
« no previous file with comments | « no previous file | media/cdm/ppapi/cdm_paths.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698