Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(688)

Side by Side Diff: media/BUILD.gn

Issue 1705333003: Move VideoCapture* files from media/base/android/... to media/capture/video/android/java/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reuploaded w --similarity=75 Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/test/BUILD.gn ('k') | media/base/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/buildflag_header.gni") 5 import("//build/buildflag_header.gni")
6 import("//build/config/android/config.gni") 6 import("//build/config/android/config.gni")
7 import("//build/config/arm.gni") 7 import("//build/config/arm.gni")
8 import("//build/config/features.gni") 8 import("//build/config/features.gni")
9 import("//build/config/linux/pkg_config.gni") 9 import("//build/config/linux/pkg_config.gni")
10 import("//build/config/ui.gni") 10 import("//build/config/ui.gni")
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 ] 400 ]
401 sources -= [ 401 sources -= [
402 "filters/decrypting_audio_decoder.cc", 402 "filters/decrypting_audio_decoder.cc",
403 "filters/decrypting_audio_decoder.h", 403 "filters/decrypting_audio_decoder.h",
404 "filters/decrypting_video_decoder.cc", 404 "filters/decrypting_video_decoder.cc",
405 "filters/decrypting_video_decoder.h", 405 "filters/decrypting_video_decoder.h",
406 ] 406 ]
407 deps += [ 407 deps += [
408 "//media/base/android", 408 "//media/base/android",
409 "//media/base/android:media_jni_headers", 409 "//media/base/android:media_jni_headers",
410 "//media/base/android:video_capture_jni_headers", 410 "//media/capture/video/android:media_java",
411 "//media/capture/video/android:video_capture_jni_headers",
411 ] 412 ]
412 413
413 # Only 64 bit builds are using android-21 NDK library, check common.gypi 414 # Only 64 bit builds are using android-21 NDK library, check common.gypi
414 if (current_cpu == "arm64" || current_cpu == "x64" || 415 if (current_cpu == "arm64" || current_cpu == "x64" ||
415 current_cpu == "mips64el") { 416 current_cpu == "mips64el") {
416 sources += [ 417 sources += [
417 "base/android/ndk_media_codec_bridge.cc", 418 "base/android/ndk_media_codec_bridge.cc",
418 "base/android/ndk_media_codec_bridge.h", 419 "base/android/ndk_media_codec_bridge.h",
419 "base/android/ndk_media_codec_wrapper.cc", 420 "base/android/ndk_media_codec_wrapper.cc",
420 ] 421 ]
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
716 717
717 data_deps = [] 718 data_deps = []
718 719
719 if (is_android) { 720 if (is_android) {
720 isolate_file = "media_unittests.isolate" 721 isolate_file = "media_unittests.isolate"
721 sources -= [ 722 sources -= [
722 "filters/decrypting_audio_decoder_unittest.cc", 723 "filters/decrypting_audio_decoder_unittest.cc",
723 "filters/decrypting_video_decoder_unittest.cc", 724 "filters/decrypting_video_decoder_unittest.cc",
724 ] 725 ]
725 deps += [ 726 deps += [
726 "//media/base/android:media_java",
727 "//media/base/android:unittests", 727 "//media/base/android:unittests",
728 "//ui/android:ui_java", 728 "//ui/android:ui_java",
729 ] 729 ]
730 } 730 }
731 731
732 # If ExternalClearKey is built, we can test CdmAdapter. 732 # If ExternalClearKey is built, we can test CdmAdapter.
733 if (enable_pepper_cdms) { 733 if (enable_pepper_cdms) {
734 sources += [ "cdm/cdm_adapter_unittest.cc" ] 734 sources += [ "cdm/cdm_adapter_unittest.cc" ]
735 data_deps += [ "//media/cdm/ppapi:clearkeycdm" ] 735 data_deps += [ "//media/cdm/ppapi:clearkeycdm" ]
736 } 736 }
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
938 if (proprietary_codecs) { 938 if (proprietary_codecs) {
939 fuzzer_test("media_cenc_utils_fuzzer") { 939 fuzzer_test("media_cenc_utils_fuzzer") {
940 sources = [ 940 sources = [
941 "cdm/cenc_utils_fuzzertest.cc", 941 "cdm/cenc_utils_fuzzertest.cc",
942 ] 942 ]
943 deps = [ 943 deps = [
944 ":media", 944 ":media",
945 ] 945 ]
946 } 946 }
947 } 947 }
OLDNEW
« no previous file with comments | « content/test/BUILD.gn ('k') | media/base/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698