diff options
| author | Pete Gillin <peteg@google.com> | 2020-07-01 10:48:14 +0100 |
|---|---|---|
| committer | Pete Gillin <peteg@google.com> | 2020-07-01 12:40:58 +0100 |
| commit | 0638dfcf944c68c56f21b1c2ca9382443e034d04 (patch) | |
| tree | a29ff68cab00af359fd894e09d9a0a1f390ee9f2 /java/java.go | |
| parent | 40a064238503f0fbe739ce7f1f68f959307c4a0e (diff) | |
Rename the Default* constants in java/config.
These values are used in two out of the many possible sdk_version
configurations, and therefore weren't really defaults in any
meaningful sense. Giving them more descriptive names makes the code
easier to follow.
Bug: 157640067
Test: m nothing
Change-Id: Icf38a9c0be2606ad0478929e1b40dfcee36cddef
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/java/java.go b/java/java.go index 7a4255745..f9d939bf1 100644 --- a/java/java.go +++ b/java/java.go @@ -695,17 +695,17 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) { sdkDep := decodeSdkDep(ctx, sdkContext(j)) if sdkDep.useDefaultLibs { - ctx.AddVariationDependencies(nil, bootClasspathTag, config.DefaultBootclasspathLibraries...) - ctx.AddVariationDependencies(nil, systemModulesTag, config.DefaultSystemModules) + ctx.AddVariationDependencies(nil, bootClasspathTag, config.LegacyCorePlatformBootclasspathLibraries...) + ctx.AddVariationDependencies(nil, systemModulesTag, config.LegacyCorePlatformSystemModules) if sdkDep.hasFrameworkLibs() { - ctx.AddVariationDependencies(nil, libTag, config.DefaultLibraries...) + ctx.AddVariationDependencies(nil, libTag, config.FrameworkLibraries...) } } else if sdkDep.useModule { ctx.AddVariationDependencies(nil, bootClasspathTag, sdkDep.bootclasspath...) ctx.AddVariationDependencies(nil, java9LibTag, sdkDep.java9Classpath...) if j.deviceProperties.EffectiveOptimizeEnabled() && sdkDep.hasStandardLibs() { - ctx.AddVariationDependencies(nil, proguardRaiseTag, config.DefaultBootclasspathLibraries...) - ctx.AddVariationDependencies(nil, proguardRaiseTag, config.DefaultLibraries...) + ctx.AddVariationDependencies(nil, proguardRaiseTag, config.LegacyCorePlatformBootclasspathLibraries...) + ctx.AddVariationDependencies(nil, proguardRaiseTag, config.FrameworkLibraries...) } } if sdkDep.systemModules != "" { |