From a4dfe24d7696145051c6929f778a100e6516d39c Mon Sep 17 00:00:00 2001 From: Artem Titov Date: Wed, 3 Jun 2020 16:42:57 +0200 Subject: [PATCH] Add missing deps for android libs to unblock chromium roll MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: None Change-Id: I1404f02cf43c3d8288fa7ae3bf128ed76856def4 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/176445 Reviewed-by: Sami Kalliomäki Reviewed-by: Mirko Bonadei Commit-Queue: Artem Titov Cr-Commit-Position: refs/heads/master@{#31428} --- examples/BUILD.gn | 16 ++++++++++++---- examples/androidnativeapi/BUILD.gn | 1 + sdk/android/BUILD.gn | 14 ++++++++++++++ 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/examples/BUILD.gn b/examples/BUILD.gn index 2acb0dd70f..ab3d5edfc9 100644 --- a/examples/BUILD.gn +++ b/examples/BUILD.gn @@ -180,10 +180,10 @@ if (is_android) { "androidapp/res/layout/fragment_call.xml", "androidapp/res/layout/fragment_hud.xml", "androidapp/res/menu/connect_menu.xml", - "androidapp/res/values/arrays.xml", - "androidapp/res/values/strings.xml", "androidapp/res/values-v17/styles.xml", "androidapp/res/values-v21/styles.xml", + "androidapp/res/values/arrays.xml", + "androidapp/res/values/strings.xml", "androidapp/res/xml/preferences.xml", ] custom_package = "org.appspot.apprtc" @@ -207,7 +207,10 @@ if (is_android) { deps = [ ":AppRTCMobile_javalib", + "../sdk/android:camera_java", "../sdk/android:libjingle_peerconnection_java", + "../sdk/android:peerconnection_java", + "../sdk/android:video_api_java", "../sdk/android:video_java", "//third_party/android_support_test_runner:runner_java", "//third_party/junit", @@ -379,14 +382,18 @@ if (is_ios || (is_mac && target_cpu != "x86")) { if (rtc_apprtcmobile_broadcast_extension) { bundle_data("AppRTCMobileBroadcastUpload_extension_bundle") { testonly = true - public_deps = [ ":AppRTCMobileBroadcastUpload" ] # no-presubmit-check TODO(webrtc:8603) + public_deps = [ # no-presubmit-check TODO(webrtc:8603) + ":AppRTCMobileBroadcastUpload", # prevent code format + ] sources = [ "$root_out_dir/AppRTCMobileBroadcastUpload.appex" ] outputs = [ "{{bundle_contents_dir}}/Plugins/{{source_file_part}}" ] } bundle_data("AppRTCMobileBroadcastSetupUI_extension_bundle") { testonly = true - public_deps = [ ":AppRTCMobileBroadcastSetupUI" ] # no-presubmit-check TODO(webrtc:8603) + public_deps = [ # no-presubmit-check TODO(webrtc:8603) + ":AppRTCMobileBroadcastSetupUI", # prevent code format + ] sources = [ "$root_out_dir/AppRTCMobileBroadcastSetupUI.appex" ] outputs = [ "{{bundle_contents_dir}}/Plugins/{{source_file_part}}" ] } @@ -859,6 +866,7 @@ if (is_android) { deps = [ ":AppRTCMobile_javalib", + "../sdk/android:peerconnection_java", "//base:base_java_test_support", "//third_party/google-truth:google_truth_java", ] diff --git a/examples/androidnativeapi/BUILD.gn b/examples/androidnativeapi/BUILD.gn index 9c114e859c..2b2c71b9e8 100644 --- a/examples/androidnativeapi/BUILD.gn +++ b/examples/androidnativeapi/BUILD.gn @@ -16,6 +16,7 @@ if (is_android) { deps = [ ":resources", "//modules/audio_device:audio_device_java", + "//rtc_base:base_java", "//sdk/android:camera_java", "//sdk/android:surfaceviewrenderer_java", "//sdk/android:video_api_java", diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn index f0e9c11b1a..69f63a648f 100644 --- a/sdk/android/BUILD.gn +++ b/sdk/android/BUILD.gn @@ -1344,9 +1344,16 @@ if (is_android) { deps = [ ":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", @@ -1354,6 +1361,7 @@ if (is_android) { "//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/hamcrest:hamcrest_library_java", "//third_party/junit", "//third_party/mockito:mockito_java", ] @@ -1508,7 +1516,13 @@ 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/google-truth:google_truth_java", ]