diff options
| author | 2022-04-06 06:14:38 +0000 | |
|---|---|---|
| committer | 2022-04-06 07:04:09 +0000 | |
| commit | a23d994022ed7452beafe42cd91f55f0bb283f63 (patch) | |
| tree | f33eb24058fb89e46ebddca5a51457c13098530a /java/kotlin.go | |
| parent | c6ef4853704080b1340170c5c30046cc4dacd418 (diff) | |
Revert "Use kapt stubs for kotlin header jar for javac"
This reverts commit c6ef4853704080b1340170c5c30046cc4dacd418.
Reason for revert: Multiple systemui presubmits are broken due to this change
Bug: 228262695
Change-Id: I1efed519c49d8d0583815c7bf2b3801bf0ba12fa
Diffstat (limited to 'java/kotlin.go')
| -rw-r--r-- | java/kotlin.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/kotlin.go b/java/kotlin.go index 818bbd5aa..eff5bb53f 100644 --- a/java/kotlin.go +++ b/java/kotlin.go @@ -163,11 +163,11 @@ var kaptStubs = pctx.AndroidRemoteStaticRule("kaptStubs", android.RemoteRuleSupp "classpath", "srcJars", "commonSrcFilesArg", "srcJarDir", "kaptDir", "kotlinJvmTarget", "kotlinBuildFile", "name", "classesJarOut") -// kotlinTurbineApt performs Kotlin-compatible annotation processing. It takes .kt and .java sources and srcjars, and runs +// kotlinKapt performs Kotlin-compatible annotation processing. It takes .kt and .java sources and srcjars, and runs // annotation processors over all of them, producing a srcjar of generated code in outputFile. The srcjar should be // added as an additional input to kotlinc and javac rules, and the javac rule should have annotation processing // disabled. -func kotlinTurbineApt(ctx android.ModuleContext, headerJarOutputFile, srcJarOutputFile, resJarOutputFile android.WritablePath, +func kotlinKapt(ctx android.ModuleContext, srcJarOutputFile, resJarOutputFile android.WritablePath, srcFiles, commonSrcFiles, srcJars android.Paths, flags javaBuilderFlags) { @@ -231,7 +231,7 @@ func kotlinTurbineApt(ctx android.ModuleContext, headerJarOutputFile, srcJarOutp // Then run turbine to perform annotation processing on the stubs and any .java srcFiles. javaSrcFiles := srcFiles.FilterByExt(".java") turbineSrcJars := append(android.Paths{kaptStubsJar}, srcJars...) - TurbineApt(ctx, headerJarOutputFile, srcJarOutputFile, resJarOutputFile, javaSrcFiles, turbineSrcJars, flags) + TurbineApt(ctx, srcJarOutputFile, resJarOutputFile, javaSrcFiles, turbineSrcJars, flags) } // kapt converts a list of key, value pairs into a base64 encoded Java serialization, which is what kapt expects. |