Revert "Add core-lambda-stubs to classpath"
This reverts commit d9d7be0617f37939b1904e6b0b6eca69da63ba5a.
Reason for revert: Broke unbundled builds.
Bug: 80428539
Change-Id: I2279dbd2b11a2f63e70ad89d0b3bc42bca2b676b
diff --git a/java/java.go b/java/java.go
index 7abd299..02fdc00 100644
--- a/java/java.go
+++ b/java/java.go
@@ -479,7 +479,6 @@
sdkDep := decodeSdkDep(ctx, String(j.deviceProperties.Sdk_version))
if sdkDep.useDefaultLibs {
ctx.AddDependency(ctx.Module(), bootClasspathTag, config.DefaultBootclasspathLibraries...)
- ctx.AddDependency(ctx.Module(), bootClasspathTag, config.DefaultLambdaStubsLibraries...)
if ctx.Config().TargetOpenJDK9() {
ctx.AddDependency(ctx.Module(), systemModulesTag, config.DefaultSystemModules)
}
@@ -491,13 +490,10 @@
ctx.AddDependency(ctx.Module(), systemModulesTag, sdkDep.systemModules)
}
ctx.AddDependency(ctx.Module(), bootClasspathTag, sdkDep.module)
- ctx.AddDependency(ctx.Module(), bootClasspathTag, config.DefaultLambdaStubsLibraries...)
if Bool(j.deviceProperties.Optimize.Enabled) {
ctx.AddDependency(ctx.Module(), proguardRaiseTag, config.DefaultBootclasspathLibraries...)
ctx.AddDependency(ctx.Module(), proguardRaiseTag, config.DefaultLibraries...)
}
- } else if sdkDep.useFiles {
- ctx.AddDependency(ctx.Module(), libTag, config.DefaultLambdaStubsLibraries...)
}
} else if j.deviceProperties.System_modules == nil {
ctx.PropertyErrorf("no_standard_libs",
@@ -629,9 +625,8 @@
func getLinkType(m *Module, name string) linkType {
ver := String(m.deviceProperties.Sdk_version)
- noStdLibs := Bool(m.properties.No_standard_libs)
switch {
- case name == "core.current.stubs" || ver == "core_current" || noStdLibs:
+ case name == "core.current.stubs" || ver == "core_current":
return javaCore
case name == "android_system_stubs_current" || strings.HasPrefix(ver, "system_"):
return javaSystem