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

Unified Diff: media/base/media_ios.cc

Issue 10919092: Build supported media targets on iOS. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 3 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 | « build/all.gyp ('k') | media/media.gyp » ('j') | media/media.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/media_ios.cc
diff --git a/media/base/media_android.cc b/media/base/media_ios.cc
similarity index 60%
copy from media/base/media_android.cc
copy to media/base/media_ios.cc
index fcfa90a57435ed1b12e03dbb4282f0eae2f04e96..f9e0cce2409267f706b4ccef7aea621e8df2066e 100644
--- a/media/base/media_android.cc
+++ b/media/base/media_ios.cc
@@ -1,18 +1,22 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 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/base/media.h"
+
#include "base/logging.h"
+// The media library is not used on iOS. Simple stubs to allow for compilation
+// without !defined(OS_IOS) blocks.
+
namespace media {
bool InitializeMediaLibrary(const FilePath& module_dir) {
- // Android doesn't require any additional media libraries.
return true;
}
-void InitializeMediaLibraryForTesting() {}
+void InitializeMediaLibraryForTesting() {
+}
bool IsMediaLibraryInitialized() {
return true;
« no previous file with comments | « build/all.gyp ('k') | media/media.gyp » ('j') | media/media.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698