From 3a3e94c09a68ff49686f78f9c8a862e2d646bf7d Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 23 Jan 2019 15:39:50 -0800
Subject: Fix kotlin annotation processing after java_plugin

I37c1e80eba71ae2d6a06199fb102194a51994989 broke kotlin annotation
processing with a typo in the processors flag to kapt and by
passing -processor to javac with an empty processorpath.

Bug: 77284273
Bug: 122251693
Test: kotlin_test.go
Test: m checkbuild
Change-Id: I17c45d5b3f9df089231af5d2930646ad0e6bf9be
---
 java/kotlin.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'java/kotlin.go')

diff --git a/java/kotlin.go b/java/kotlin.go
index 1b2e6429e..9c47f98a7 100644
--- a/java/kotlin.go
+++ b/java/kotlin.go
@@ -121,7 +121,7 @@ func kotlinKapt(ctx android.ModuleContext, outputFile android.WritablePath,
 
 	kaptProcessor := ""
 	if flags.processor != "" {
-		kaptProcessor = "-P plugin:org.jetbrains.kotlin.kapt3:processor=" + flags.processor
+		kaptProcessor = "-P plugin:org.jetbrains.kotlin.kapt3:processors=" + flags.processor
 	}
 
 	encodedJavacFlags := kaptEncodeFlags([][2]string{
-- 
cgit v1.2.3-59-g8ed1b