diff options
| author | Colin Cross <ccross@android.com> | 2020-06-18 15:46:32 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2020-06-19 12:53:09 -0700 |
| commit | 3791b45f670062d8d01c87b1debb7c36cbed9e70 (patch) | |
| tree | 8001bfe3d6e59170071adf5b8605eb01dcfa3d50 /java/java.go | |
| parent | 1e28e3c61593571db5ecea328d134ee50501104d (diff) | |
Fix annotation processors in kotlin modules that generate resources
The kapt rule was only keeping the generated sources, and not the
generated classes directory. The generated classes directory will
contain resources generated by the annotation processor and needs
to be added to the final jar.
Test: m ApiFinder
Bug: 153485543
Change-Id: I89197d0afcb1eee011c01aa400f9977e66f43768
Merged-In: I89197d0afcb1eee011c01aa400f9977e66f43768
(cherry picked from commit 9ca38d22a49127901dadb14ffa093e29a2942f2d)
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go index 0c0c659e9..e8d434424 100644 --- a/java/java.go +++ b/java/java.go @@ -1327,8 +1327,10 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) { if len(flags.processorPath) > 0 { // Use kapt for annotation processing kaptSrcJar := android.PathForModuleOut(ctx, "kapt", "kapt-sources.jar") - kotlinKapt(ctx, kaptSrcJar, kotlinSrcFiles, srcJars, flags) + kaptResJar := android.PathForModuleOut(ctx, "kapt", "kapt-res.jar") + kotlinKapt(ctx, kaptSrcJar, kaptResJar, kotlinSrcFiles, srcJars, flags) srcJars = append(srcJars, kaptSrcJar) + kotlinJars = append(kotlinJars, kaptResJar) // Disable annotation processing in javac, it's already been handled by kapt flags.processorPath = nil flags.processors = nil |