commit c7e92f4d6772b66be03f8e37d1f86b9c340cbf25
author Sky Malice <skym@chromium.org> Tue May 24 21:32:49 2022
committer Copybara-Service <copybara-worker@google.com> Tue May 24 21:53:32 2022
tree 335ffcfdff55084d0addeeb1177db24630ead7ea
parent 81581824032049950f7bf402a78d4006a14dc2cd

Revert "Reland "Android: Make TrichromeLibrary.apk have no classes.dex""

This reverts commit 3d1dd9017a9dac36f8cdedc084f10ccb56db433d.

Reason for revert: Speculative revert from clank Trichrome apk error, see crbug.com/1328926

Original change's description:
> Reland "Android: Make TrichromeLibrary.apk have no classes.dex"
>
> This reverts commit 293df39872b775e1223c86c1a6863f50f06c4fbc.
>
> Reason for reland: Fixed system_webview_no_weblayer_apk
>
> Original change's description:
> > Revert "Android: Make TrichromeLibrary.apk have no classes.dex"
> >
> > This reverts commit b1e26665ad91606db1ade9fe8f021ef7dbbe879a.
> >
> > Reason for revert:
> > Findit (https://goo.gl/kROfz5) identified this CL at revision b1e26665ad91606db1ade9fe8f021ef7dbbe879a as
> > the culprit for failures in the continuous build including:
> >
> > Sample Failed Build: https://ci.chromium.org/b/8813697873572499617
> > Sample Failed Step: compile
> >
> > If it is a false positive, please report it at https://bugs.chromium.org/p/chromium/issues/entry?status=Available&comment=Datastore+key+for+the+culprit+entity%3A+chromium.googlesource.com%2Fchromium%2Fsrc%2Frefs%2Fheads%2Fmain%2Fb1e26665ad91606db1ade9fe8f021ef7dbbe879a&labels=Test-Findit-Wrong&components=Tools%3ETest%3EFindIt&summary=Wrongly+blame+b1e26665ad91606db1ade9fe8f021ef7dbbe879a
> >
> > Original change's description:
> > > Android: Make TrichromeLibrary.apk have no classes.dex
> > >
> > > Moves NativeLibraries class from the library to chrome/webview apks.
> > >
> > > This will allow better R8 optimization of the class, and should also
> > > hopefully result in better performance since the library should no
> > > longer need to be included in classloader lookups.
> > >
> > > Bug: 1319967
> > > Change-Id: I2c5908e6c575c9bce8c606506779e7db89f3269a
> > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3650992
> > > Reviewed-by: Richard Coles <torne@chromium.org>
> > > Reviewed-by: Peter Wen <wnwen@chromium.org>
> > > Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> > > Cr-Commit-Position: refs/heads/main@{#1005425}
> >
> >
> > Change-Id: Ief1ae992169e351c2f70dcb6da8adb234e5106a8
> > No-Presubmit: true
> > No-Tree-Checks: true
> > No-Try: true
> > Bug: 1319967
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3656342
> > Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> > Owners-Override: Andrew Grieve <agrieve@chromium.org>
> > Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> > Cr-Commit-Position: refs/heads/main@{#1005577}
>
> Bug: 1319967
> Change-Id: Ie06eab28a62bfa24420f1395358cae6b1dd7c640
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3654798
> Reviewed-by: Peter Wen <wnwen@chromium.org>
> Reviewed-by: Richard Coles <torne@chromium.org>
> Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1006984}

Bug: 1319967
Change-Id: Ib206849260a258a802f800c8762a79b2b372bd68
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3664288
Commit-Queue: Sky Malice <skym@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Auto-Submit: Sky Malice <skym@chromium.org>
Owners-Override: Sky Malice <skym@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1007069}
NOKEYCHECK=True
GitOrigin-RevId: 807fc51745a18c9869e55da0e105480b56af774c