diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-01 15:25:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-01 15:25:53 +0000 |
| commit | 8034eafbedd5ed68930117d8f90a6e4be84c55a3 (patch) | |
| tree | 7da041a910acb455bedef3822e21ebd5c7051d76 /java/java.go | |
| parent | 47f4e1789ea9697c598b376f13e256d979fda74b (diff) | |
| parent | 98d8ee9bd8cdf3c4c3ba31f71612db420b3bbf7d (diff) | |
Merge "Rename the Default* constants in java/config." am: 8f70db2b48 am: 98d8ee9bd8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353886
Change-Id: Ibf0533b6bd01244d30c5df89aa849a7f8da6f777
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 98586b250..d8cbc1f7d 100644 --- a/java/java.go +++ b/java/java.go @@ -705,17 +705,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 != "" { |