Android: Use android_deps directly

This is preparing for upstream removing the alias java_groups for the
individual support library targets: https://crrev.com/c/1500780

Bug: chromium:937987
Change-Id: I1c9efd83f6997288b334f3dc2f41233fa4e2ab61
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/125961
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#26995}
This commit is contained in:
Peter Wen 2019-03-06 09:18:57 -05:00 committed by Commit Bot
parent c44f6cc5fe
commit 7bc331f664
5 changed files with 16 additions and 16 deletions

View file

@ -152,7 +152,7 @@ if (is_android) {
"../sdk/android:video_api_java",
"../sdk/android:video_java",
"androidapp/third_party/autobanh:autobanh_java",
"//third_party/android_deps:android_support_annotations_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
]
}
@ -870,7 +870,7 @@ if (is_android) {
"../sdk/android:libjingle_peerconnection_java",
"../sdk/android:peerconnection_java",
"../sdk/android:video_java",
"//third_party/android_deps:android_support_annotations_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
]
}
@ -886,7 +886,7 @@ if (is_android) {
"../rtc_base:base_java",
"../sdk/android:libjingle_peerconnection_java",
"../sdk/android:libjingle_peerconnection_metrics_default_java",
"//third_party/android_deps:android_support_annotations_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
]
}
}

View file

@ -18,7 +18,7 @@ if (is_android) {
"//sdk/android:surfaceviewrenderer_java",
"//sdk/android:video_api_java",
"//sdk/android:video_java",
"//third_party/android_deps:android_support_annotations_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
]
shared_libraries = [ ":examples_androidnativeapi_jni" ]

View file

@ -486,7 +486,7 @@ if (!build_with_chromium && is_android) {
]
deps = [
"../../rtc_base:base_java",
"//third_party/android_deps:android_support_annotations_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
]
}
}

View file

@ -1439,7 +1439,7 @@ if (is_android) {
"java/src/org/webrtc/ThreadUtils.java",
]
deps = [
"//third_party/android_deps:android_support_annotations_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
]
}
}

View file

@ -204,7 +204,7 @@ if (is_android) {
deps = [
"//rtc_base:base_java",
"//third_party/android_deps:android_support_annotations_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
]
}
@ -240,7 +240,7 @@ if (is_android) {
deps = [
":base_java",
"//rtc_base:base_java",
"//third_party/android_deps:android_support_annotations_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
]
}
@ -279,7 +279,7 @@ if (is_android) {
":base_java",
":video_api_java",
"//rtc_base:base_java",
"//third_party/android_deps:android_support_annotations_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
]
}
@ -346,7 +346,7 @@ if (is_android) {
":video_java",
"//modules/audio_device:audio_device_java",
"//rtc_base:base_java",
"//third_party/android_deps:android_support_annotations_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
]
}
@ -372,7 +372,7 @@ if (is_android) {
":video_api_java",
":video_java",
"//rtc_base:base_java",
"//third_party/android_deps:android_support_annotations_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
]
}
@ -387,7 +387,7 @@ if (is_android) {
":swcodecs_java",
":video_api_java",
":video_java",
"//third_party/android_deps:android_support_annotations_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
]
}
@ -430,7 +430,7 @@ if (is_android) {
":video_api_java",
":video_java",
"//rtc_base:base_java",
"//third_party/android_deps:android_support_annotations_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
]
}
@ -449,7 +449,7 @@ if (is_android) {
":audio_api_java",
":base_java",
"//rtc_base:base_java",
"//third_party/android_deps:android_support_annotations_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
]
}
@ -471,7 +471,7 @@ if (is_android) {
":video_api_java",
":video_java",
"//rtc_base:base_java",
"//third_party/android_deps:android_support_annotations_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
]
}
@ -529,7 +529,7 @@ if (is_android) {
":video_api_java",
":video_java",
"//rtc_base:base_java",
"//third_party/android_deps:android_support_annotations_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
]
}