diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/droiddoc.go | 12 | ||||
| -rw-r--r-- | java/java.go | 6 | ||||
| -rw-r--r-- | java/sdk.go | 4 | ||||
| -rw-r--r-- | java/sdk_library.go | 6 |
4 files changed, 14 insertions, 14 deletions
diff --git a/java/droiddoc.go b/java/droiddoc.go index 9c88a3ca2..cbca12a76 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -305,17 +305,17 @@ func apiCheckEnabled(ctx android.ModuleContext, apiToCheck ApiToCheck, apiVersio } 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 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 diff --git a/java/sdk.go b/java/sdk.go index 32a4b5a88..a68abfb51 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -371,8 +371,8 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext sdkContext) sdkDep 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 92b554bd9..fa81d0a62 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -1534,7 +1534,7 @@ func (module *SdkLibrary) CreateInternalModules(mctx android.DefaultableHookCont 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 @@ func (module *SdkLibrary) CreateInternalModules(mctx android.DefaultableHookCont 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) |