| 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/arm.gni") | 6 import("//build/config/arm.gni") |
| 7 import("//build/config/ui.gni") | 7 import("//build/config/ui.gni") |
| 8 import("//build/config/linux/pkg_config.gni") | 8 import("//build/config/linux/pkg_config.gni") |
| 9 import("//media/media_options.gni") | 9 import("//media/media_options.gni") |
| 10 | 10 |
| (...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 491 "filters/pipeline_integration_test_base.cc", | 491 "filters/pipeline_integration_test_base.cc", |
| 492 ] | 492 ] |
| 493 } else { | 493 } else { |
| 494 # TODO(ajwong): Blocked on android. | 494 # TODO(ajwong): Blocked on android. |
| 495 # deps += [ | 495 # deps += [ |
| 496 # ":player_android", | 496 # ":player_android", |
| 497 # "//testing/android:native_test_native_code" | 497 # "//testing/android:native_test_native_code" |
| 498 # ] | 498 # ] |
| 499 } | 499 } |
| 500 | 500 |
| 501 if (cpu_arch != "arm" && is_chromeos && use_x11) { | 501 if (cpu_arch != "arm" && is_chromeos) { |
| 502 sources += [ "filters/h264_bitstream_buffer_unittest.cc" ] | 502 sources += [ "filters/h264_bitstream_buffer_unittest.cc" ] |
| 503 } | 503 } |
| 504 | 504 |
| 505 if (proprietary_codecs) { | 505 if (proprietary_codecs) { |
| 506 sources += [ | 506 sources += [ |
| 507 "filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc", | 507 "filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc", |
| 508 "filters/h264_to_annex_b_bitstream_converter_unittest.cc", | 508 "filters/h264_to_annex_b_bitstream_converter_unittest.cc", |
| 509 "formats/common/stream_parser_test_base.cc", | 509 "formats/common/stream_parser_test_base.cc", |
| 510 "formats/common/stream_parser_test_base.h", | 510 "formats/common/stream_parser_test_base.h", |
| 511 "formats/mp2t/es_adapter_video_unittest.cc", | 511 "formats/mp2t/es_adapter_video_unittest.cc", |
| (...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 740 java_cpp_template("media_android_imageformat_list") { | 740 java_cpp_template("media_android_imageformat_list") { |
| 741 sources = [ | 741 sources = [ |
| 742 "base/android/java/src/org/chromium/media/ImageFormat.template", | 742 "base/android/java/src/org/chromium/media/ImageFormat.template", |
| 743 ] | 743 ] |
| 744 inputs = [ | 744 inputs = [ |
| 745 "video/capture/android/imageformat_list.h" | 745 "video/capture/android/imageformat_list.h" |
| 746 ] | 746 ] |
| 747 package_name = "org/chromium/media" | 747 package_name = "org/chromium/media" |
| 748 } | 748 } |
| 749 } | 749 } |
| OLD | NEW |