diff options
| author | Jaewoong Jung <jungjw@google.com> | 2020-12-23 01:21:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-12-23 01:21:28 +0000 |
| commit | e794b1e30262ac2af41bf1bdb23cc975773451b5 (patch) | |
| tree | c054bd284f2e3a5539e7edf481831f39a0b44480 /java/java.go | |
| parent | 98dea9498230f5809f80edc258a9d46140e2aebb (diff) | |
| parent | 18aefc19776337955c9a1a8946f188900cb4d537 (diff) | |
Merge "Remove unnecessary snake case variables."
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/java.go b/java/java.go index 719915ef9..04c49deb4 100644 --- a/java/java.go +++ b/java/java.go @@ -1505,11 +1505,11 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) { j.compiledJavaSrcs = uniqueSrcFiles j.compiledSrcJars = srcJars - enable_sharding := false + enableSharding := false var headerJarFileWithoutJarjar android.Path if ctx.Device() && !ctx.Config().IsEnvFalse("TURBINE_ENABLED") && !deps.disableTurbine { if j.properties.Javac_shard_size != nil && *(j.properties.Javac_shard_size) > 0 { - enable_sharding = true + enableSharding = true // 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 @@ -1535,7 +1535,7 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) { extraJarDeps = append(extraJarDeps, errorprone) } - if enable_sharding { + if enableSharding { flags.classpath = append(flags.classpath, headerJarFileWithoutJarjar) shardSize := int(*(j.properties.Javac_shard_size)) var shardSrcs []android.Paths |