| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/android/config.gni") | 5 import("//build/config/android/config.gni") |
| 6 import("//build/config/android/rules.gni") | 6 import("//build/config/android/rules.gni") |
| 7 import("//build/config/arm.gni") | 7 import("//build/config/arm.gni") |
| 8 import("//build/config/ui.gni") | 8 import("//build/config/ui.gni") |
| 9 import("//media/media_options.gni") | 9 import("//media/media_options.gni") |
| 10 | 10 |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 "//url", | 71 "//url", |
| 72 ] | 72 ] |
| 73 } | 73 } |
| 74 | 74 |
| 75 source_set("unittests") { | 75 source_set("unittests") { |
| 76 testonly = true | 76 testonly = true |
| 77 sources = [ | 77 sources = [ |
| 78 "access_unit_queue_unittest.cc", | 78 "access_unit_queue_unittest.cc", |
| 79 "media_codec_bridge_unittest.cc", | 79 "media_codec_bridge_unittest.cc", |
| 80 "media_codec_decoder_unittest.cc", | 80 "media_codec_decoder_unittest.cc", |
| 81 "media_codec_player_unittest.cc", |
| 81 "media_drm_bridge_unittest.cc", | 82 "media_drm_bridge_unittest.cc", |
| 82 "media_source_player_unittest.cc", | 83 "media_source_player_unittest.cc", |
| 83 "test_data_factory.cc", | 84 "test_data_factory.cc", |
| 84 "test_data_factory.h", | 85 "test_data_factory.h", |
| 85 ] | 86 ] |
| 86 deps = [ | 87 deps = [ |
| 87 ":android", | 88 ":android", |
| 88 "//media/base:test_support", | 89 "//media/base:test_support", |
| 89 "//testing/gmock", | 90 "//testing/gmock", |
| 90 "//testing/gtest", | 91 "//testing/gtest", |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 | 128 |
| 128 android_library("media_java") { | 129 android_library("media_java") { |
| 129 deps = [ | 130 deps = [ |
| 130 "//base:base_java", | 131 "//base:base_java", |
| 131 ] | 132 ] |
| 132 | 133 |
| 133 srcjar_deps = [ ":media_java_enums_srcjar" ] | 134 srcjar_deps = [ ":media_java_enums_srcjar" ] |
| 134 | 135 |
| 135 DEPRECATED_java_in_dir = "java/src" | 136 DEPRECATED_java_in_dir = "java/src" |
| 136 } | 137 } |
| OLD | NEW |