Skip to content

Backport some newer JDK features down to JDK 11 #478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Bencodes wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −9
Open

Backport some newer JDK features down to JDK 11 #478

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions src/tools/java/com/google/devtools/build/android/dexer/DexFileSplitter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,12 +326,12 @@ private void processDexes(

for (GroupTask task : tasks) {
List<ZipEntryAndContent> zipEntryAndContentses = new ArrayList<>();
ZipEntryAndContent contextZdc = task.contextFuture().get();
ZipEntryAndContent contextZdc = task.contextFuture.get();
checkNotNull(
contextZdc, "Context class %s expected to be in %s", task.filename(), task.zipName());
contextZdc, "Context class %s expected to be in %s", task.filename, task.zipName);
zipEntryAndContentses.add(contextZdc);

for (ListenableFuture<ZipEntryAndContent> synthFuture : task.syntheticFutures()) {
for (ListenableFuture<ZipEntryAndContent> synthFuture : task.syntheticFutures) {
ZipEntryAndContent syntheticClassZdc = synthFuture.get();
// Some synthetic classes are contained within the same dex as their enclosing class,
// so they won't be standalone dexes in the zip file, and some synthetic classes are
Expand All @@ -343,7 +343,7 @@ private void processDexes(
}
}

processGroup(task.filename(), zipEntryAndContentses);
processGroup(task.filename, zipEntryAndContentses);
}
}
executor.shutdown();
Expand Down Expand Up @@ -427,11 +427,23 @@ private ZipEntryAndContent readAndParseDex(ZipFile zip, String filename) {
* Represents a unit of work for processing a context DEX file and its associated synthetic DEX
* files in parallel.
*/
private record GroupTask(
String filename,
String zipName,
ListenableFuture<ZipEntryAndContent> contextFuture,
List<ListenableFuture<ZipEntryAndContent>> syntheticFutures) {}
private static final class GroupTask {
final String filename;
final String zipName;
final ListenableFuture<ZipEntryAndContent> contextFuture;
final List<ListenableFuture<ZipEntryAndContent>> syntheticFutures;

GroupTask(
String filename,
String zipName,
ListenableFuture<ZipEntryAndContent> contextFuture,
List<ListenableFuture<ZipEntryAndContent>> syntheticFutures) {
this.filename = filename;
this.zipName = zipName;
this.contextFuture = contextFuture;
this.syntheticFutures = syntheticFutures;
}
}

private static final class ZipEntryAndContent {
final ZipEntry zipEntry;
Expand Down