diff options
| author | Ashley Rose <ashleyrose@google.com> | 2019-01-16 17:34:08 -0500 |
|---|---|---|
| committer | Ashley Rose <ashleyrose@google.com> | 2019-01-17 11:29:09 -0500 |
| commit | e36efcfa9369cbc7178e32cfa626759bbda04f11 (patch) | |
| tree | 4ad96d125ed122c6867fb9b49eedf1a12df9c2cf /java/java.go | |
| parent | d4a393466a0436da82e39f6792c36aaa2841bdef (diff) | |
Relax restriction on sharded annotation processors
Bug: 77284273
Test: m framework
Change-Id: If617bcf65b5d04ecb81227a9a8b76bbd78ea8598
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/java/java.go b/java/java.go index c89cb1a8d..2ac5a5b46 100644 --- a/java/java.go +++ b/java/java.go @@ -998,12 +998,11 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path if ctx.Device() && !ctx.Config().IsEnvFalse("TURBINE_ENABLED") { if j.properties.Javac_shard_size != nil && *(j.properties.Javac_shard_size) > 0 { enable_sharding = true - if len(j.properties.Annotation_processors) != 0 || - len(j.properties.Annotation_processor_classes) != 0 { - ctx.PropertyErrorf("javac_shard_size", - "%q cannot be set when annotation processors are enabled.", - j.properties.Javac_shard_size) - } + // Formerly, there was a check here that prevented annotation processors + // from being used when sharding was enabled, as some annotation processors + // do not function correctly in sharded environments. It was removed to + // allow for the use of annotation processors that do function correctly + // with sharding enabled. See: b/77284273. } j.headerJarFile = j.compileJavaHeader(ctx, uniqueSrcFiles, srcJars, deps, flags, jarName, kotlinJars) if ctx.Failed() { |