diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-01 14:56:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-01 14:56:57 +0000 |
| commit | 98d8ee9bd8cdf3c4c3ba31f71612db420b3bbf7d (patch) | |
| tree | 6a88a25ebaddc8c06ec308fdf9ddab3b0ec1e5f3 /java/java.go | |
| parent | d6bc08bdbd870af944187c8f54f751a1d1d1507c (diff) | |
| parent | 8f70db2b482ff5bef5a965539b90ed0dfc585c9d (diff) | |
Merge "Rename the Default* constants in java/config." am: 8f70db2b48
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353886
Change-Id: Ibcc651741aeff9bdfc783ed59a718e9c089ba769
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 aa843ee27..be60ccad2 100644 --- a/java/java.go +++ b/java/java.go @@ -701,17 +701,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 != "" { |