-
Gabriel Charette authored
This reverts commit f34af30b. Reason for revert: broke android-pie-arm64-rel https://ci.chromium.org/p/chromium/builders/try/android-pie-arm64-rel/124453 ERROR at //third_party/android_deps/BUILD.gn:1408:30: Assignment had no effect. enable_bytecode_rewriter = false ^---- You set the variable "enable_bytecode_rewriter" here and it was unused before it went out of scope. See //third_party/android_deps/BUILD.gn:1404:1: whence it was called. java_prebuilt("org_robolectric_android_all_java") { ^-------------------------------------------------- See //services/BUILD.gn:106:7: which caused the file to be included. "$google_play_services_package:google_play_services_base_java", ^------------------------------------------------------------- Original change's description: > add robolectric_all to android_deps. > > This is the same file as included in > > https://source.chromium.org/chromium/chromium/src/+/master:third_party/robolectric/cipd.yaml;l=16?originalUrl=https:%2F%2Fcs.chromium.org%2F > https://source.chromium.org/chromium/chromium/src/+/master:third_party/robolectric/BUILD.gn;l=59?originalUrl=https:%2F%2Fcs.chromium.org%2F > > I'm just moving it to android_deps, so I don't think we need security > or license review. > > Will remove duplicate file when robolectric moves to android_deps. > I could possibly remove it now but sdk_texts writes in the location. > https://source.chromium.org/chromium/chromium/src/+/master:third_party/robolectric/BUILD.gn;l=268?originalUrl=https:%2F%2Fcs.chromium.org%2F > > Bug: 1060721 > Change-Id: I95fd2fc63d652c3b7274753532e6a86081f60a58 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2210094 > Reviewed-by: Peter Wen <wnwen@chromium.org> > Reviewed-by: Yaron Friedman <yfriedman@chromium.org> > Commit-Queue: benjamin joyce <bjoyce@chromium.org> > Cr-Commit-Position: refs/heads/master@{#771084} TBR=yfriedman@chromium.org,wnwen@chromium.org,agrieve@chromium.org,bjoyce@chromium.org Change-Id: I0b12781d7df4416d76629c336373ceb608983c87 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 1060721 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2212464Reviewed-by:
Gabriel Charette <gab@chromium.org> Commit-Queue: Gabriel Charette <gab@chromium.org> Cr-Commit-Position: refs/heads/master@{#771094}
de12227c