zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert of Creating libwebrtc bundle jar (patchset #4 id:60001 of https://codereview.webrtc.org/2646443002/ )

Browse Source 
Reason for revert:
This breaks some chromium.webrtc.fyi buildbots with the following error:

ERROR Unresolved dependencies.
//third_party/webrtc/base:base(//build/toolchain/android:android_arm)
  needs //third_party/webrtc/base:base_java(//build/toolchain/android:android_arm)

Original issue's description:
> Creating libwebrtc bundle jar
>
> Creates a JAR which includes:
> - //webrtc/base:base_java
> - //webrtc/modules/audio_device:audio_device_java
> - //webrtc/sdk/android:libjingle_peerconnection_java
> - //webrtc/sdk/android:libjingle_peerconnection_metrics_default_java
>
> The libwebrtc.jar file will be generated at '<output_dir>/lib.java/webrtc/sdk/android/libwebrtc.jar'.
>
> BUG=webrtc:6356
>
> Review-Url: https://codereview.webrtc.org/2646443002
> Cr-Commit-Position: refs/heads/master@{#16189}
> Committed: a62a82b7e7

TBR=kjellander@webrtc.org,sakal@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:6356

Review-Url: https://codereview.webrtc.org/2640023010
Cr-Commit-Position: refs/heads/master@{#16190}
This commit is contained in:
mbonadei
2017-01-20 06:48:03 -08:00
committed by Commit bot
parent a62a82b7e7
commit 3c9151b953
5 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
webrtc/sdk/android/BUILD.gn
View File

@ -110,19 +110,6 @@ rtc_shared_library("libjingle_peerconnection_so") {
output_extension = "so"
}
dist_jar("libwebrtc") {
_target_dir_name = get_label_info(":$target_name", "dir")
output = "${root_out_dir}/lib.java${_target_dir_name}/${target_name}.jar"
direct_deps_only = true
use_interface_jars = false
deps = [
":libjingle_peerconnection_java",
":libjingle_peerconnection_metrics_default_java",
"//webrtc/base:base_java",
"//webrtc/modules/audio_device:audio_device_java",
]
}
android_library("libjingle_peerconnection_java") {
java_files = [
"api/org/webrtc/AudioSource.java",
@ -184,8 +171,9 @@ android_library("libjingle_peerconnection_java") {
deps = [
"//webrtc/base:base_java",
"//webrtc/modules/audio_device:audio_device_java",
]
srcjar_deps = [ "//webrtc/modules/audio_device:audio_device_java" ]
}
android_library("libjingle_peerconnection_metrics_default_java") {