summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-05 00:27:29 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-05 00:27:29 +0000
commit6b6ee027ab8952c404b42842ce797b459859145e (patch)
treec76a7245eadda9daa6fae2b9f09e466a890c71ad /media
parent372b2291dfd99e95389ef85e611cf521a2be7237 (diff)
downloadchromium_src-6b6ee027ab8952c404b42842ce797b459859145e.zip
chromium_src-6b6ee027ab8952c404b42842ce797b459859145e.tar.gz
chromium_src-6b6ee027ab8952c404b42842ce797b459859145e.tar.bz2
omx_unittests to load OpenMAX library dynamically
Now OpenMAX library has to be loaded dynamically. Review URL: http://codereview.chromium.org/667010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40693 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/media.gyp1
-rw-r--r--media/omx/run_all_unittests.cc8
2 files changed, 8 insertions, 1 deletions
diff --git a/media/media.gyp b/media/media.gyp
index 88e29c9..2d20b70 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -285,6 +285,7 @@
'target_name': 'omx_unittests',
'type': 'executable',
'dependencies': [
+ 'media',
'omx_wrapper',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
diff --git a/media/omx/run_all_unittests.cc b/media/omx/run_all_unittests.cc
index 841b353..dbc6ea8 100644
--- a/media/omx/run_all_unittests.cc
+++ b/media/omx/run_all_unittests.cc
@@ -1,9 +1,15 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 "base/test/test_suite.h"
+#include "media/base/media.h"
int main(int argc, char** argv) {
+ // Load the OpenMAX library.
+ if (!media::InitializeOpenMaxLibrary(FilePath())) {
+ LOG(ERROR) << "Unable to initialize OpenMAX library.";
+ return -1;
+ }
return TestSuite(argc, argv).Run();
}