Skip to content
This repository was archived by the owner on Oct 25, 2024. It is now read-only.

Commit 38d5304

Browse files
authored
Fix android build issues after rebasing to M88 (#133)
1 parent 51f552a commit 38d5304

File tree

3 files changed

+84
-84
lines changed

3 files changed

+84
-84
lines changed

examples/androidnativeapi/BUILD.gn

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ if (is_android) {
1515

1616
deps = [
1717
":resources",
18-
"//modules/audio_device:audio_device_java",
19-
"//rtc_base:base_java",
20-
"//sdk/android:camera_java",
21-
"//sdk/android:surfaceviewrenderer_java",
22-
"//sdk/android:video_api_java",
23-
"//sdk/android:video_java",
18+
"../../modules/audio_device:audio_device_java",
19+
"../../rtc_base:base_java",
20+
"../../sdk/android:camera_java",
21+
"../../sdk/android:surfaceviewrenderer_java",
22+
"../../sdk/android:video_api_java",
23+
"../../sdk/android:video_java",
2424
"//third_party/android_deps:com_android_support_support_annotations_java",
2525
]
2626

@@ -49,19 +49,19 @@ if (is_android) {
4949
":generated_jni",
5050
"../../api:scoped_refptr",
5151
"../../rtc_base/synchronization:mutex",
52-
"//api:libjingle_peerconnection_api",
53-
"//api/rtc_event_log:rtc_event_log_factory",
54-
"//api/task_queue:default_task_queue_factory",
55-
"//media:rtc_audio_video",
56-
"//media:rtc_internal_video_codecs",
57-
"//media:rtc_media_engine_defaults",
58-
"//modules/utility",
59-
"//pc:libjingle_peerconnection",
60-
"//rtc_base",
61-
"//rtc_base:rtc_base_approved",
62-
"//sdk/android:native_api_base",
63-
"//sdk/android:native_api_jni",
64-
"//sdk/android:native_api_video",
52+
"../../api:libjingle_peerconnection_api",
53+
"../../api/rtc_event_log:rtc_event_log_factory",
54+
"../../api/task_queue:default_task_queue_factory",
55+
"../../media:rtc_audio_video",
56+
"../../media:rtc_internal_video_codecs",
57+
"../../media:rtc_media_engine_defaults",
58+
"../../modules/utility",
59+
"../../pc:libjingle_peerconnection",
60+
"../../rtc_base",
61+
"../../rtc_base:rtc_base_approved",
62+
"../../sdk/android:native_api_base",
63+
"../../sdk/android:native_api_jni",
64+
"../../sdk/android:native_api_video",
6565
]
6666
}
6767

examples/androidvoip/BUILD.gn

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# in the file PATENTS. All contributing project authors may
77
# be found in the AUTHORS file in the root of the source tree.
88

9-
import("//webrtc.gni")
9+
import("../../webrtc.gni")
1010

1111
if (is_android) {
1212
rtc_android_apk("androidvoip") {
@@ -24,11 +24,11 @@ if (is_android) {
2424

2525
deps = [
2626
":resources",
27-
"//modules/audio_device:audio_device_java",
28-
"//rtc_base:base_java",
29-
"//sdk/android:base_java",
30-
"//sdk/android:java_audio_device_module_java",
31-
"//sdk/android:video_java",
27+
"../../modules/audio_device:audio_device_java",
28+
"../../rtc_base:base_java",
29+
"../../sdk/android:base_java",
30+
"../../sdk/android:java_audio_device_module_java",
31+
"../../sdk/android:video_java",
3232
"//third_party/android_deps:androidx_core_core_java",
3333
"//third_party/android_deps:androidx_legacy_legacy_support_v4_java",
3434
]
@@ -56,19 +56,19 @@ if (is_android) {
5656

5757
deps = [
5858
":generated_jni",
59-
"//api:transport_api",
60-
"//api/audio_codecs:audio_codecs_api",
61-
"//api/audio_codecs:builtin_audio_decoder_factory",
62-
"//api/audio_codecs:builtin_audio_encoder_factory",
63-
"//api/task_queue:default_task_queue_factory",
64-
"//api/voip:voip_api",
65-
"//api/voip:voip_engine_factory",
66-
"//modules/utility:utility",
67-
"//rtc_base",
68-
"//rtc_base/third_party/sigslot:sigslot",
69-
"//sdk/android:native_api_audio_device_module",
70-
"//sdk/android:native_api_base",
71-
"//sdk/android:native_api_jni",
59+
"../../api:transport_api",
60+
"../../api/audio_codecs:audio_codecs_api",
61+
"../../api/audio_codecs:builtin_audio_decoder_factory",
62+
"../../api/audio_codecs:builtin_audio_encoder_factory",
63+
"../../api/task_queue:default_task_queue_factory",
64+
"../../api/voip:voip_api",
65+
"../../api/voip:voip_engine_factory",
66+
"../../modules/utility:utility",
67+
"../../rtc_base",
68+
"../../rtc_base/third_party/sigslot:sigslot",
69+
"../../sdk/android:native_api_audio_device_module",
70+
"../../sdk/android:native_api_base",
71+
"../../sdk/android:native_api_jni",
7272
"//third_party/abseil-cpp/absl/memory:memory",
7373
]
7474
}

0 commit comments

Comments
 (0)