| commit | 2f5d600918226030fefabe4069bb363425f77d72 | [log] [tgz] |
|---|---|---|
| author | kjellander <kjellander@webrtc.org> | Wed May 18 11:57:44 2016 |
| committer | Commit bot <commit-bot@chromium.org> | Wed May 18 11:57:51 2016 |
| tree | 4157ae00660aed2b10fab030b9355da087354f5d | |
| parent | 99111bb5e4bf6f8b98421b89179950be49716ac8 [diff] [blame] |
Revert of Remove Android x86 compilation trybot from CQ. (patchset #1 id:1 of https://codereview.webrtc.org/1959923002/ ) Reason for revert: https://codereview.chromium.org/1985413002/ rolled in the fix for libjpeg_turbo's GYP file in Chromium. That was rolled into WebRTC in https://codereview.webrtc.org/1985423004/. That means our Android x86 builds can start working again. Original issue's description: > Remove Android x86 compilation trybot from CQ. > > There's a Goma bug making it fail to compile after rolling in > https://codereview.webrtc.org/1963493002/ > > BUG=chromium:610145 > TBR=pbos@webrtc.org > NOTRY=True > > Committed: https://chromium.googlesource.com/external/webrtc/+/d939d48de2d27d3a79b81adcd71f221673bda40f TBR=pbos@webrtc.org NOTRY=True BUG=chromium:610145 TESTED=Passing build with: GYP_DEFINES='OS=android component=static_library target_arch=ia32' webrtc/build/gyp_webrtc.py ninja -C out/Debug Review-Url: https://codereview.webrtc.org/1989223002 Cr-Commit-Position: refs/heads/master@{#12792}
diff --git a/infra/config/cq.cfg b/infra/config/cq.cfg index b7e26cc..84498ec 100644 --- a/infra/config/cq.cfg +++ b/infra/config/cq.cfg
@@ -31,8 +31,7 @@ builders { name: "android_arm64_rel" } builders { name: "android_clang_dbg" } builders { name: "android_compile_mips_dbg" } - # Disabled until http://crbug.com/610145 is fixed. - #builders { name: "android_compile_x86_dbg" } + builders { name: "android_compile_x86_dbg" } builders { name: "android_compile_x64_dbg" } builders { name: "android_gn_dbg" } builders { name: "android_gn_rel" }