diff options
Diffstat (limited to 'sdk/android/BUILD.gn')
| -rw-r--r-- | sdk/android/BUILD.gn | 50 |
1 files changed, 38 insertions, 12 deletions
diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn index 9ecf0afb34..4506cbdbf3 100644 --- a/sdk/android/BUILD.gn +++ b/sdk/android/BUILD.gn @@ -272,7 +272,6 @@ if (is_android) { "api/org/webrtc/MediaSource.java", "api/org/webrtc/MediaStream.java", "api/org/webrtc/MediaStreamTrack.java", - "api/org/webrtc/MediaTransportFactoryFactory.java", "api/org/webrtc/NativeLibraryLoader.java", "api/org/webrtc/NativePeerConnectionFactory.java", "api/org/webrtc/NetEqFactoryFactory.java", @@ -322,10 +321,11 @@ if (is_android) { ":video_java", "//modules/audio_device:audio_device_java", "//rtc_base:base_java", + "//third_party/android_deps:androidx_annotation_annotation_java", "//third_party/android_deps:com_android_support_support_annotations_java", ] srcjar_deps = [ - "//api:rtp_parameters_enums", + "//api:priority_enums", "//api/video:video_frame_enums", ] } @@ -468,6 +468,7 @@ if (is_android) { ] deps = [ + ":base_java", ":video_api_java", ":video_java", "//rtc_base:base_java", @@ -557,8 +558,8 @@ if (current_os == "linux" || is_android) { "../../rtc_base:rtc_base_approved", "../../system_wrappers:field_trial", "../../system_wrappers:metrics", - "//third_party/abseil-cpp/absl/types:optional", ] + absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] } rtc_library("audio_jni") { @@ -653,10 +654,11 @@ if (current_os == "linux" || is_android) { "../../rtc_base", "../../rtc_base:checks", "../../rtc_base:rtc_task_queue", + "../../rtc_base/synchronization:mutex", "../../rtc_base/task_utils:to_queued_task", - "//third_party/abseil-cpp/absl/types:optional", "//third_party/libyuv", ] + absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] } rtc_library("peerconnection_jni") { @@ -744,6 +746,8 @@ if (current_os == "linux" || is_android) { "../../rtc_base:rtc_task_queue", "../../rtc_base/system:thread_registry", "../../system_wrappers:field_trial", + ] + absl_deps = [ "//third_party/abseil-cpp/absl/memory", "//third_party/abseil-cpp/absl/types:optional", ] @@ -836,8 +840,8 @@ if (current_os == "linux" || is_android) { "//api:array_view", "//rtc_base:checks", "//rtc_base:rtc_base_approved", - "//third_party/abseil-cpp/absl/types:optional", ] + absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] } rtc_library("native_api_base") { @@ -931,8 +935,9 @@ if (current_os == "linux" || is_android) { "../../rtc_base:criticalsection", "../../rtc_base:logging", "../../rtc_base:stringutils", - "//third_party/abseil-cpp/absl/base:core_headers", + "../../rtc_base/synchronization:mutex", ] + absl_deps = [ "//third_party/abseil-cpp/absl/base:core_headers" ] } # API for creating C++ wrapper implementations of api/mediastreaminterface.h @@ -1041,8 +1046,8 @@ if (current_os == "linux" || is_android) { "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", "../../system_wrappers:metrics", - "//third_party/abseil-cpp/absl/types:optional", ] + absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] } rtc_library("java_audio_device_module") { @@ -1064,8 +1069,8 @@ if (current_os == "linux" || is_android) { "../../rtc_base:rtc_base_approved", "../../system_wrappers:field_trial", "../../system_wrappers:metrics", - "//third_party/abseil-cpp/absl/types:optional", ] + absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] } if (rtc_enable_android_aaudio) { @@ -1091,8 +1096,8 @@ if (current_os == "linux" || is_android) { "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", "../../system_wrappers", - "//third_party/abseil-cpp/absl/types:optional", ] + absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] } } @@ -1117,8 +1122,8 @@ if (current_os == "linux" || is_android) { "../../modules/audio_device:audio_device_buffer", "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", - "//third_party/abseil-cpp/absl/types:optional", ] + absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] } ######################### @@ -1304,7 +1309,7 @@ if (is_android) { rtc_instrumentation_test_apk("android_instrumentation_test_apk") { apk_name = "android_instrumentation_test_apk" android_manifest = "instrumentationtests/AndroidManifest.xml" - min_sdk_version = 16 + min_sdk_version = 21 target_sdk_version = 21 sources = [ @@ -1342,17 +1347,29 @@ if (is_android) { data = [ "../../sdk/android/instrumentationtests/src/org/webrtc/capturetestvideo.y4m" ] deps = [ + ":audio_api_java", ":base_java", + ":builtin_audio_codecs_java", + ":camera_java", ":default_video_codec_factory_java", + ":filevideo_java", + ":hwcodecs_java", ":libjingle_peerconnection_java", ":libjingle_peerconnection_metrics_default_java", + ":peerconnection_java", + ":surfaceviewrenderer_java", + ":swcodecs_java", ":video_api_java", ":video_java", "//base:base_java_test_support", "//rtc_base:base_java", + "//third_party/android_deps:com_android_support_support_annotations_java", "//third_party/android_support_test_runner:rules_java", "//third_party/android_support_test_runner:runner_java", "//third_party/google-truth:google_truth_java", + "//third_party/guava:guava_android_java", + "//third_party/hamcrest:hamcrest_java", + "//third_party/hamcrest:hamcrest_library_java", "//third_party/junit", "//third_party/mockito:mockito_java", ] @@ -1442,6 +1459,7 @@ if (is_android) { "../../pc:libjingle_peerconnection", "../../rtc_base:checks", "../../rtc_base:rtc_base", + "../../rtc_base/synchronization:mutex", "../../rtc_base/system:inline", "../../system_wrappers", "../../system_wrappers:field_trial", @@ -1449,8 +1467,8 @@ if (is_android) { "../../test:fileutils", "../../test:test_support", "../../testing/gtest", - "//third_party/abseil-cpp/absl/memory", ] + absl_deps = [ "//third_party/abseil-cpp/absl/memory" ] } rtc_android_library("native_unittests_java") { @@ -1507,9 +1525,17 @@ if (is_android) { ] deps = [ + ":base_java", + ":camera_java", + ":hwcodecs_java", ":libjingle_peerconnection_java", + ":peerconnection_java", + ":video_api_java", + ":video_java", "//base:base_java_test_support", + "//third_party/android_deps:com_android_support_support_annotations_java", "//third_party/google-truth:google_truth_java", + "//third_party/guava:guava_android_java", ] additional_jar_files = [ [ |