| Index: media/base/android/BUILD.gn
|
| diff --git a/media/base/android/BUILD.gn b/media/base/android/BUILD.gn
|
| index db4937fe2b4e11687089b2561012551b79801dc7..67c8efdb66a9ea1863fd17a9e18ce04becda8af1 100644
|
| --- a/media/base/android/BUILD.gn
|
| +++ b/media/base/android/BUILD.gn
|
| @@ -7,47 +7,6 @@ import("//build/config/arm.gni")
|
| import("//build/config/ui.gni")
|
| import("//media/media_options.gni")
|
|
|
| -# These should compile on non-android platforms too.
|
| -source_set("anywhere") {
|
| - sources = [
|
| - "media_codec_bridge.cc",
|
| - "media_codec_bridge.h",
|
| - "media_codec_direction.h",
|
| - "media_codec_loop.cc",
|
| - "media_codec_loop.h",
|
| - ]
|
| - configs += [
|
| - "//media:media_config",
|
| - "//media:media_implementation",
|
| - ]
|
| - deps = [
|
| - "//media:media_features",
|
| - "//media:shared_memory_support",
|
| - "//ui/gl",
|
| - "//url",
|
| - ]
|
| -}
|
| -
|
| -# These should compile on non-android platforms too.
|
| -source_set("anywhere_unit_tests") {
|
| - testonly = true
|
| - sources = [
|
| - "media_codec_loop_unittest.cc",
|
| - "mock_media_codec_bridge.cc",
|
| - "mock_media_codec_bridge.h",
|
| - ]
|
| - configs += [
|
| - "//media:media_config",
|
| - "//media:media_implementation",
|
| - ]
|
| - deps = [
|
| - ":anywhere",
|
| - "//media/base:test_support",
|
| - "//testing/gmock",
|
| - "//testing/gtest",
|
| - ]
|
| -}
|
| -
|
| if (is_android) {
|
| import("//build/config/android/rules.gni")
|
|
|
| @@ -57,6 +16,12 @@ if (is_android) {
|
| "android_cdm_factory.h",
|
| "media_client_android.cc",
|
| "media_client_android.h",
|
| + "media_codec_bridge.h",
|
| + "media_codec_bridge_impl.cc",
|
| + "media_codec_bridge_impl.h",
|
| + "media_codec_direction.h",
|
| + "media_codec_loop.cc",
|
| + "media_codec_loop.h",
|
| "media_codec_util.cc",
|
| "media_codec_util.h",
|
| "media_drm_bridge.cc",
|
| @@ -81,8 +46,6 @@ if (is_android) {
|
| "media_service_throttler.cc",
|
| "media_service_throttler.h",
|
| "media_url_interceptor.h",
|
| - "sdk_media_codec_bridge.cc",
|
| - "sdk_media_codec_bridge.h",
|
| "stream_texture_wrapper.h",
|
| ]
|
| configs += [
|
| @@ -97,19 +60,19 @@ if (is_android) {
|
| "//ui/gl",
|
| "//url",
|
| ]
|
| - public_deps = [
|
| - ":anywhere",
|
| - ]
|
| }
|
|
|
| source_set("unit_tests") {
|
| testonly = true
|
| sources = [
|
| + "media_codec_bridge_impl_unittest.cc",
|
| + "media_codec_loop_unittest.cc",
|
| "media_codec_util_unittest.cc",
|
| "media_drm_bridge_unittest.cc",
|
| "media_player_bridge_unittest.cc",
|
| "media_service_throttler_unittest.cc",
|
| - "sdk_media_codec_bridge_unittest.cc",
|
| + "mock_media_codec_bridge.cc",
|
| + "mock_media_codec_bridge.h",
|
| ]
|
|
|
| deps = [
|
|
|