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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/base/mime_util_unittest.cc

Issue 1577433004: Flip proprietary codecs to false for Android chromium builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove mp4. Fix comment. Created 4 years, 9 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
« media/base/android/BUILD.gn ('K') | « media/base/android/BUILD.gn ('k') | media/filters/audio_decoder_unittest.cc » ('j') | media/media.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/mime_util_unittest.cc
diff --git a/media/base/mime_util_unittest.cc b/media/base/mime_util_unittest.cc
index da9877da533d938eb95c40adb154a0bb76b1dba3..0690f85f73b3c27cdb84d28a2d1bba3e946eaff2 100644
--- a/media/base/mime_util_unittest.cc
+++ b/media/base/mime_util_unittest.cc
@@ -131,7 +131,7 @@ TEST(MimeUtilTest, CommonMediaMimeType) {
EXPECT_TRUE(IsSupportedMediaMimeType("video/ogg"));
#endif // OS_ANDROID
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && defined(USE_PROPRIETARY_CODECS)
// HLS is supported on Android API level 14 and higher and Chrome supports
// API levels 15 and higher, so these are expected to be supported.
bool kHlsSupported = true;
« media/base/android/BUILD.gn ('K') | « media/base/android/BUILD.gn ('k') | media/filters/audio_decoder_unittest.cc » ('j') | media/media.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698