GitLab

This reverts commit 7bd37b66.

Reason for revert: this did not appear to be the culprit.

Original change's description:
> Revert "Reland: Update build rules to support ARCore"
> 
> This reverts commit 14c289be.
> 
> Reason for revert:
> Speculative revert for APK merger failure on official 64 bit builders:
> https://bugs.chromium.org/p/chromium/issues/detail?id=840342
> 
> Original change's description:
> > Reland: Update build rules to support ARCore
> > 
> > In this change, I've moved the code in chrome_public_apk_tmpl from the
> > monochrome to he chrome template and ensured that apk_merger will pass.
> > 
> > > Define enable_arcore and add some build rules to use it.
> > >
> > > Bug: 833511
> > > Change-Id: I716123c2a282d7d123883df81ebbc00a0a883be8
> > > Reviewed-on: https://chromium-review.googlesource.com/1033580
> > > Commit-Queue: Ian Vollick <vollick@chromium.org>
> > > Reviewed-by: John Budorick <jbudorick@chromium.org>
> > > Reviewed-by: Eric Stevenson <estevenson@chromium.org>
> > > Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
> > > Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
> > > Reviewed-by: David Dorwin <ddorwin@chromium.org>
> > > Cr-Commit-Position: refs/heads/master@{#555174}
> > 
> > Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_vr
> > Change-Id: I155d420f3b6606642cdfea43db48840f2c21a0cb
> > Reviewed-on: https://chromium-review.googlesource.com/1040905
> > Reviewed-by: Tao Bai <michaelbai@chromium.org>
> > Reviewed-by: Scott Violet <sky@chromium.org>
> > Reviewed-by: Will Harris <wfh@chromium.org>
> > Reviewed-by: Bill Orr <billorr@chromium.org>
> > Reviewed-by: Eric Stevenson <estevenson@chromium.org>
> > Reviewed-by: Richard Coles <torne@chromium.org>
> > Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
> > Commit-Queue: Ian Vollick <vollick@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#556200}
> 
> TBR=vollick@chromium.org,sky@chromium.org,michaelbai@chromium.org,yfriedman@chromium.org,torne@chromium.org,wfh@chromium.org,estevenson@chromium.org,jbudorick@chromium.org,billorr@chromium.org
> 
> # Not skipping CQ checks because original CL landed > 1 day ago.
> 
> Change-Id: I99a778b62c27506b820d36dfc90aafac3c88f553
> Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_vr
> Reviewed-on: https://chromium-review.googlesource.com/1047945
> Reviewed-by: Ted Choc <tedchoc@chromium.org>
> Commit-Queue: Ted Choc <tedchoc@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#556508}

TBR=vollick@chromium.org,sky@chromium.org,michaelbai@chromium.org,yfriedman@chromium.org,torne@chromium.org,tedchoc@chromium.org,wfh@chromium.org,estevenson@chromium.org,jbudorick@chromium.org,billorr@chromium.org

Change-Id: I8186226aa5be33b11f01fa7b751c41b3f94bb32f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_vr
Reviewed-on: https://chromium-review.googlesource.com/1049845Reviewed-by: Ian Vollick <vollick@chromium.org>
Commit-Queue: Ian Vollick <vollick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#556764}