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

This reverts commit b1e26665ad91606db1ade9fe8f021ef7dbbe879a.

Reason for revert:
Findit ( identified this CL at revision b1e26665ad91606db1ade9fe8f021ef7dbbe879a as
the culprit for failures in the continuous build including:

Sample Failed Build:
Sample Failed Step: compile

If it is a false positive, please report it at

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:
> Reviewed-by: Richard Coles <>
> Reviewed-by: Peter Wen <>
> Commit-Queue: Andrew Grieve <>
> Cr-Commit-Position: refs/heads/main@{#1005425}

Change-Id: Ief1ae992169e351c2f70dcb6da8adb234e5106a8
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1319967
Reviewed-by: Andrew Grieve <>
Owners-Override: Andrew Grieve <>
Commit-Queue: Andrew Grieve <>
Cr-Commit-Position: refs/heads/main@{#1005577}
GitOrigin-RevId: 293df39872b775e1223c86c1a6863f50f06c4fbc
1 file changed