Remove unnecessary snake case variables.
Test: m nothing + TreeHugger
Change-Id: I99f7162944daa6c57c6ae4763261e108bb5cb6b1
diff --git a/java/droiddoc.go b/java/droiddoc.go
index 9c88a3c..cbca12a 100644
--- a/java/droiddoc.go
+++ b/java/droiddoc.go
@@ -305,17 +305,17 @@
}
func ignoreMissingModules(ctx android.BottomUpMutatorContext, apiToCheck *ApiToCheck) {
- api_file := String(apiToCheck.Api_file)
- removed_api_file := String(apiToCheck.Removed_api_file)
+ apiFile := String(apiToCheck.Api_file)
+ removedApiFile := String(apiToCheck.Removed_api_file)
- api_module := android.SrcIsModule(api_file)
- removed_api_module := android.SrcIsModule(removed_api_file)
+ apiModule := android.SrcIsModule(apiFile)
+ removedApiModule := android.SrcIsModule(removedApiFile)
- if api_module == "" || removed_api_module == "" {
+ if apiModule == "" || removedApiModule == "" {
return
}
- if ctx.OtherModuleExists(api_module) || ctx.OtherModuleExists(removed_api_module) {
+ if ctx.OtherModuleExists(apiModule) || ctx.OtherModuleExists(removedApiModule) {
return
}
diff --git a/java/java.go b/java/java.go
index 719915e..04c49de 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1505,11 +1505,11 @@
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 @@
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
diff --git a/java/sdk.go b/java/sdk.go
index 32a4b5a..a68abfb 100644
--- a/java/sdk.go
+++ b/java/sdk.go
@@ -371,8 +371,8 @@
jar := filepath.Join(dir, "android.jar")
// There's no aidl for other SDKs yet.
// TODO(77525052): Add aidl files for other SDKs too.
- public_dir := filepath.Join("prebuilts", "sdk", sdkVersion.version.String(), "public")
- aidl := filepath.Join(public_dir, "framework.aidl")
+ publicDir := filepath.Join("prebuilts", "sdk", sdkVersion.version.String(), "public")
+ aidl := filepath.Join(publicDir, "framework.aidl")
jarPath := android.ExistentPathForSource(ctx, jar)
aidlPath := android.ExistentPathForSource(ctx, aidl)
lambdaStubsPath := android.PathForSource(ctx, config.SdkLambdaStubsPath)
diff --git a/java/sdk_library.go b/java/sdk_library.go
index 92b554b..fa81d0a 100644
--- a/java/sdk_library.go
+++ b/java/sdk_library.go
@@ -1534,7 +1534,7 @@
hasSystemAndTestApis := sdkDep.hasStandardLibs()
module.sdkLibraryProperties.Generate_system_and_test_apis = hasSystemAndTestApis
- missing_current_api := false
+ missingCurrentApi := false
generatedScopes := module.getGeneratedApiScopes(mctx)
@@ -1545,12 +1545,12 @@
p := android.ExistentPathForSource(mctx, path)
if !p.Valid() {
mctx.ModuleErrorf("Current api file %#v doesn't exist", path)
- missing_current_api = true
+ missingCurrentApi = true
}
}
}
- if missing_current_api {
+ if missingCurrentApi {
script := "build/soong/scripts/gen-java-current-api-files.sh"
p := android.ExistentPathForSource(mctx, script)