| Index: media/base/run_all_unittests.cc
|
| diff --git a/media/base/run_all_unittests.cc b/media/base/run_all_unittests.cc
|
| index fe097f11a71a8cc0f405fa5b70d03f6de6747c10..bcf8eb1e92bb3cbc5197d64807cf3fd0d6230557 100644
|
| --- a/media/base/run_all_unittests.cc
|
| +++ b/media/base/run_all_unittests.cc
|
| @@ -12,10 +12,13 @@
|
|
|
| #if defined(OS_ANDROID)
|
| #include "base/android/jni_android.h"
|
| +#include "media/base/android/media_codec_bridge.h"
|
| #include "media/base/android/media_jni_registrar.h"
|
| #include "ui/gl/android/gl_jni_registrar.h"
|
| #endif
|
|
|
| +#include "testing/gtest/include/gtest/gtest.h"
|
| +
|
| class TestSuiteNoAtExit : public base::TestSuite {
|
| public:
|
| TestSuiteNoAtExit(int argc, char** argv) : TestSuite(argc, argv) {}
|
| @@ -29,6 +32,11 @@ void TestSuiteNoAtExit::Initialize() {
|
| base::TestSuite::Initialize();
|
|
|
| #if defined(OS_ANDROID)
|
| + if (!MediaCodecBridge::IsAvailable()) {
|
| + base::TestSuite::DisableTests("MediaCodecBridgeTest.*");
|
| + base::TestSuite::DisableTests("MediaSourcePlayerTest.*");
|
| + }
|
| +
|
| // Register JNI bindings for android.
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| // Needed for surface texture support.
|
|
|