diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-01-17 18:10:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-01-17 18:10:06 +0000 |
| commit | fffddb799ece984973365529b9fa2ae6b7d02a2b (patch) | |
| tree | 153775bdc8f949d8fb900fcab854b7f150e10f9a /java/java.go | |
| parent | 671e066812c9a408eaf4c9dec6739d0f7afe4b96 (diff) | |
| parent | e36efcfa9369cbc7178e32cfa626759bbda04f11 (diff) | |
Merge "Relax restriction on sharded annotation processors"
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() { |