| 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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   77 } |   77 } | 
|   78  |   78  | 
|   79 source_set("unittests") { |   79 source_set("unittests") { | 
|   80   testonly = true |   80   testonly = true | 
|   81   sources = [ |   81   sources = [ | 
|   82     "access_unit_queue_unittest.cc", |   82     "access_unit_queue_unittest.cc", | 
|   83     "media_codec_bridge_unittest.cc", |   83     "media_codec_bridge_unittest.cc", | 
|   84     "media_codec_decoder_unittest.cc", |   84     "media_codec_decoder_unittest.cc", | 
|   85     "media_codec_player_unittest.cc", |   85     "media_codec_player_unittest.cc", | 
|   86     "media_drm_bridge_unittest.cc", |   86     "media_drm_bridge_unittest.cc", | 
 |   87     "media_player_bridge_unittest.cc", | 
|   87     "media_source_player_unittest.cc", |   88     "media_source_player_unittest.cc", | 
|   88     "test_data_factory.cc", |   89     "test_data_factory.cc", | 
|   89     "test_data_factory.h", |   90     "test_data_factory.h", | 
|   90     "test_statistics.h", |   91     "test_statistics.h", | 
|   91   ] |   92   ] | 
|   92   deps = [ |   93   deps = [ | 
|   93     ":android", |   94     ":android", | 
|   94     "//media/base:test_support", |   95     "//media/base:test_support", | 
|   95     "//testing/gmock", |   96     "//testing/gmock", | 
|   96     "//testing/gtest", |   97     "//testing/gtest", | 
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  133  |  134  | 
|  134 android_library("media_java") { |  135 android_library("media_java") { | 
|  135   deps = [ |  136   deps = [ | 
|  136     "//base:base_java", |  137     "//base:base_java", | 
|  137   ] |  138   ] | 
|  138  |  139  | 
|  139   srcjar_deps = [ ":media_java_enums_srcjar" ] |  140   srcjar_deps = [ ":media_java_enums_srcjar" ] | 
|  140  |  141  | 
|  141   DEPRECATED_java_in_dir = "java/src" |  142   DEPRECATED_java_in_dir = "java/src" | 
|  142 } |  143 } | 
| OLD | NEW |