admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reland of Fix android_junit_tests and add a GN target for them. (patchset #1 id:1 of https://codereview.webrtc.org/2341213003/ )

Browse Source 
Reason for revert:
Fix the issue.

Original issue's description:
> Revert of Fix android_junit_tests and add a GN target for them. (patchset #1 id:20001 of https://codereview.webrtc.org/2346793002/ )
>
> Reason for revert:
> Breaks WebRTC in Chrome on Android:
>
> https://build.chromium.org/p/chromium.webrtc.fyi/waterfall?builder=Android%20Builder%20(dbg)
>
> Original issue's description:
> > Fix android_junit_tests and add a GN target for them.
> >
> > BUG=webrtc:6365
> > NOTRY=True
> >
> > Committed: https://crrev.com/bb716daea73889517f996aa29f867563ed63d58a
> > Cr-Commit-Position: refs/heads/master@{#14241}
>
> TBR=magjed@webrtc.org,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:6365
>
> Committed: https://crrev.com/9adb1ff9439aecf4e8ac3972a631bb74df2b6868
> Cr-Commit-Position: refs/heads/master@{#14253}

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

Review-Url: https://codereview.webrtc.org/2344133002
Cr-Commit-Position: refs/heads/master@{#14254}
This commit is contained in:
sakal 2016-09-16 04:28:03 -07:00 committed by Commit bot
parent 9adb1ff943
commit 51fe1d805d
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
webrtc/BUILD.gn
View File

@ -827,4 +827,15 @@ if (rtc_include_tests) {
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
}
if (is_android) {
junit_binary("android_junit_tests") {
java_files = [ "androidjunit/src/org/webrtc/CameraEnumerationTest.java" ]
deps = [
"//webrtc/api:libjingle_peerconnection_java",
"//webrtc/api:libjingle_peerconnection_jni",
]
}
}
}