Support OpenJDK output for Android Java (compiler-explorer#7122)

This change adds OpenJDK as an output compiler for Android Java,
beginning with 11.0.2. This change also updates java.ts to allow for
input libraries, by parsing library paths and passing them into the
javac invocation as '-cp \<path\>:\<path\>:...'.

This is intended to simplify the process of inspecting javac output when
Android Java is already selected so that a user doesn't have to switch
to the Java compiler option. This also allows a user to view javac
output with Android libraries.

Author: kevinjeon-g

etc/config/android-java.amazon.properties

@@ -1,4 +1,4 @@
-compilers=&android-d8:&android-r8:&dex2oat
+compilers=&android-d8:&android-r8:&dex2oat:&android-openjdk
 
 group.android-d8.compilers=java-d8-8156:java-d8-8172:java-d8-8233:java-d8-8242:java-d8-8247:java-d8-8336:java-d8-8337:java-d8-8510:java-d8-8527:java-d8-8535
 group.android-d8.compilerType=android-d8
@@ -139,6 +139,105 @@ compiler.java-dex2oat-3310.objdumper=/opt/compiler-explorer/dex2oat-33.10/x86_64
 compiler.java-dex2oat-3310.d8Id=java-d8-8242
 compiler.java-dex2oat-3310.profmanPath=/opt/compiler-explorer/dex2oat-33.10/x86_64/bin/profman
 
+group.android-openjdk.compilers=android-openjdk-1102:android-openjdk-1201:android-openjdk-1202:android-openjdk-1302:android-openjdk-1402:android-openjdk-1502:android-openjdk-1601:android-openjdk-1700:android-openjdk-1702:android-openjdk-1800:android-openjdk-1802:android-openjdk-1902:android-openjdk-2000:android-openjdk-2002:android-openjdk-2100:android-openjdk-2102:android-openjdk-2200
+group.android-openjdk.compilerType=java
+group.android-openjdk.versionFlag=-version
+group.android-openjdk.groupName=OpenJDK
+group.android-openjdk.demangler=
+group.android-openjdk.postProcess=
+group.android-openjdk.options=
+group.android-openjdk.supportsBinary=false
+group.android-openjdk.needsMulti=false
+group.android-openjdk.supportsExecute=true
+group.android-openjdk.interpreted=true
+group.android-openjdk.isSemVer=true
+group.android-openjdk.baseName=jdk
+
+compiler.android-openjdk-2200.exe=/opt/compiler-explorer/jdk-22.0.0/bin/javac
+compiler.android-openjdk-2200.objdumper=/opt/compiler-explorer/jdk-22.0.0/bin/javap
+compiler.android-openjdk-2200.runtime=/opt/compiler-explorer/jdk-22.0.0/bin/java
+compiler.android-openjdk-2200.semver=22.0.0
+
+compiler.android-openjdk-2102.exe=/opt/compiler-explorer/jdk-21.0.2/bin/javac
+compiler.android-openjdk-2102.objdumper=/opt/compiler-explorer/jdk-21.0.2/bin/javap
+compiler.android-openjdk-2102.runtime=/opt/compiler-explorer/jdk-21.0.2/bin/java
+compiler.android-openjdk-2102.semver=21.0.2
+
+compiler.android-openjdk-2100.exe=/opt/compiler-explorer/jdk-21.0.0/bin/javac
+compiler.android-openjdk-2100.objdumper=/opt/compiler-explorer/jdk-21.0.0/bin/javap
+compiler.android-openjdk-2100.runtime=/opt/compiler-explorer/jdk-21.0.0/bin/java
+compiler.android-openjdk-2100.semver=21.0.0
+
+compiler.android-openjdk-2002.exe=/opt/compiler-explorer/jdk-20.0.2/bin/javac
+compiler.android-openjdk-2002.objdumper=/opt/compiler-explorer/jdk-20.0.2/bin/javap
+compiler.android-openjdk-2002.runtime=/opt/compiler-explorer/jdk-20.0.2/bin/java
+compiler.android-openjdk-2002.semver=20.0.2
+
+compiler.android-openjdk-2000.exe=/opt/compiler-explorer/jdk-20.0.0/bin/javac
+compiler.android-openjdk-2000.objdumper=/opt/compiler-explorer/jdk-20.0.0/bin/javap
+compiler.android-openjdk-2000.runtime=/opt/compiler-explorer/jdk-20.0.0/bin/java
+compiler.android-openjdk-2000.semver=20.0.0
+
+compiler.android-openjdk-1902.exe=/opt/compiler-explorer/jdk-19.0.2/bin/javac
+compiler.android-openjdk-1902.objdumper=/opt/compiler-explorer/jdk-19.0.2/bin/javap
+compiler.android-openjdk-1902.runtime=/opt/compiler-explorer/jdk-19.0.2/bin/java
+compiler.android-openjdk-1902.semver=19.0.2
+
+compiler.android-openjdk-1802.exe=/opt/compiler-explorer/jdk-18.0.2/bin/javac
+compiler.android-openjdk-1802.objdumper=/opt/compiler-explorer/jdk-18.0.2/bin/javap
+compiler.android-openjdk-1802.runtime=/opt/compiler-explorer/jdk-18.0.2/bin/java
+compiler.android-openjdk-1802.semver=18.0.2
+
+compiler.android-openjdk-1800.exe=/opt/compiler-explorer/jdk-18.0.0/bin/javac
+compiler.android-openjdk-1800.objdumper=/opt/compiler-explorer/jdk-18.0.0/bin/javap
+compiler.android-openjdk-1800.runtime=/opt/compiler-explorer/jdk-18.0.0/bin/java
+compiler.android-openjdk-1800.semver=18.0.0
+
+compiler.android-openjdk-1702.exe=/opt/compiler-explorer/jdk-17.0.2/bin/javac
+compiler.android-openjdk-1702.objdumper=/opt/compiler-explorer/jdk-17.0.2/bin/javap
+compiler.android-openjdk-1702.runtime=/opt/compiler-explorer/jdk-17.0.2/bin/java
+compiler.android-openjdk-1702.semver=17.0.2
+
+compiler.android-openjdk-1700.exe=/opt/compiler-explorer/jdk-17.0.0/bin/javac
+compiler.android-openjdk-1700.objdumper=/opt/compiler-explorer/jdk-17.0.0/bin/javap
+compiler.android-openjdk-1700.runtime=/opt/compiler-explorer/jdk-17.0.0/bin/java
+compiler.android-openjdk-1700.semver=17.0.0
+
+compiler.android-openjdk-1601.exe=/opt/compiler-explorer/jdk-16.0.1/bin/javac
+compiler.android-openjdk-1601.objdumper=/opt/compiler-explorer/jdk-16.0.1/bin/javap
+compiler.android-openjdk-1601.runtime=/opt/compiler-explorer/jdk-16.0.1/bin/java
+compiler.android-openjdk-1601.semver=16.0.1
+
+compiler.android-openjdk-1502.exe=/opt/compiler-explorer/jdk-15.0.2/bin/javac
+compiler.android-openjdk-1502.objdumper=/opt/compiler-explorer/jdk-15.0.2/bin/javap
+compiler.android-openjdk-1502.runtime=/opt/compiler-explorer/jdk-15.0.2/bin/java
+compiler.android-openjdk-1502.semver=15.0.2
+
+compiler.android-openjdk-1402.exe=/opt/compiler-explorer/jdk-14.0.2/bin/javac
+compiler.android-openjdk-1402.objdumper=/opt/compiler-explorer/jdk-14.0.2/bin/javap
+compiler.android-openjdk-1402.runtime=/opt/compiler-explorer/jdk-14.0.2/bin/java
+compiler.android-openjdk-1402.semver=14.0.2
+
+compiler.android-openjdk-1302.exe=/opt/compiler-explorer/jdk-13.0.2/bin/javac
+compiler.android-openjdk-1302.objdumper=/opt/compiler-explorer/jdk-13.0.2/bin/javap
+compiler.android-openjdk-1302.runtime=/opt/compiler-explorer/jdk-13.0.2/bin/java
+compiler.android-openjdk-1302.semver=13.0.2
+
+compiler.android-openjdk-1202.exe=/opt/compiler-explorer/jdk-12.0.2/bin/javac
+compiler.android-openjdk-1202.objdumper=/opt/compiler-explorer/jdk-12.0.2/bin/javap
+compiler.android-openjdk-1202.runtime=/opt/compiler-explorer/jdk-12.0.2/bin/java
+compiler.android-openjdk-1202.semver=12.0.2
+
+compiler.android-openjdk-1201.exe=/opt/compiler-explorer/jdk-12.0.1/bin/javac
+compiler.android-openjdk-1201.objdumper=/opt/compiler-explorer/jdk-12.0.1/bin/javap
+compiler.android-openjdk-1201.runtime=/opt/compiler-explorer/jdk-12.0.1/bin/java
+compiler.android-openjdk-1201.semver=12.0.1
+
+compiler.android-openjdk-1102.exe=/opt/compiler-explorer/jdk-11.0.2/bin/javac
+compiler.android-openjdk-1102.objdumper=/opt/compiler-explorer/jdk-11.0.2/bin/javap
+compiler.android-openjdk-1102.runtime=/opt/compiler-explorer/jdk-11.0.2/bin/java
+compiler.android-openjdk-1102.semver=11.0.2
+
 defaultCompiler=java-dex2oat-latest
 
 libs=android-api-stubs:r8-keepanno:androidx-annotation

lib/compilers/java.ts

@@ -26,12 +26,19 @@ import path from 'path';
 
 import fs from 'fs-extra';
 import Semver from 'semver';
+import _ from 'underscore';
 
 import type {ParsedAsmResult, ParsedAsmResultLine} from '../../types/asmresult/asmresult.interfaces.js';
-import {BypassCache, CacheKey, CompilationResult} from '../../types/compilation/compilation.interfaces.js';
+import {
+    BypassCache,
+    CacheKey,
+    CompilationResult,
+    ExecutionOptionsWithEnv,
+} from '../../types/compilation/compilation.interfaces.js';
 import type {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js';
 import {ExecutableExecutionOptions} from '../../types/execution/execution.interfaces.js';
 import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js';
+import type {SelectedLibraryVersion} from '../../types/libraries/libraries.interfaces.js';
 import {assert, unwrap} from '../assert.js';
 import {BaseCompiler, SimpleOutputFilenameCompiler} from '../base-compiler.js';
 import {CompilationEnvironment} from '../compilation-env.js';
@@ -48,6 +55,8 @@ export class JavaCompiler extends BaseCompiler implements SimpleOutputFilenameCo
     javaRuntime: string;
     mainRegex: RegExp;
 
+    libPaths: string[];
+
     constructor(compilerInfo: PreliminaryCompilerInfo, env: CompilationEnvironment) {
         super(
             {
@@ -59,12 +68,42 @@ export class JavaCompiler extends BaseCompiler implements SimpleOutputFilenameCo
         );
         this.javaRuntime = this.compilerProps<string>(`compiler.${this.compiler.id}.runtime`);
         this.mainRegex = /public static ?(.*?) void main\(java\.lang\.String\[]\)/;
+        this.libPaths = [];
     }
 
     override getSharedLibraryPathsAsArguments() {
         return [];
     }
 
+    override async runCompiler(
+        compiler: string,
+        options: string[],
+        inputFilename: string,
+        execOptions: ExecutionOptionsWithEnv,
+        filters?: ParseFiltersAndOutputOptions,
+    ): Promise<CompilationResult> {
+        if (!execOptions) {
+            execOptions = this.getDefaultExecOptions();
+        }
+
+        if (!execOptions.customCwd) {
+            execOptions.customCwd = path.dirname(inputFilename);
+        }
+
+        // The items in 'options' before the source file are user inputs.
+        const sourceFileOptionIndex = options.findIndex(option => {
+            return option.endsWith('.java');
+        });
+        const userOptions = options.slice(0, sourceFileOptionIndex);
+        const javaOptions = _.compact([...this.getClasspathArgument(), ...userOptions, inputFilename]);
+        const result = await this.exec(compiler, javaOptions, execOptions);
+        return {
+            ...this.transformToCompilationResult(result, inputFilename),
+            languageId: this.getCompilerResultLanguageId(filters),
+            instructionSet: this.getInstructionSetFromCompilerArgs(options),
+        };
+    }
+
     override async objdump(outputFilename: string, result: any, maxSize: number) {
         const dirPath = path.dirname(outputFilename);
         const files = await fs.readdir(dirPath);
@@ -417,4 +456,18 @@ export class JavaCompiler extends BaseCompiler implements SimpleOutputFilenameCo
             textsBeforeMethod,
         };
     }
+
+    getClasspathArgument(): string[] {
+        const libString = this.libPaths.join(':');
+        return libString ? ['-cp', libString] : [''];
+    }
+
+    override getIncludeArguments(libraries: SelectedLibraryVersion[], dirPath: string): string[] {
+        this.libPaths = libraries.flatMap(selectedLib => {
+            const foundVersion = this.findLibVersion(selectedLib);
+            if (!foundVersion) return [];
+            return foundVersion.path;
+        });
+        return this.libPaths;
+    }
 }