Revert^2: "Setting Java 11 as the default version"

Reverted Change: I2f9866deff41406aede24758f6eda5e5808c7f29

Reason for revert: Post-submission failure have been fixed.

Test: presubmit
Bug: 195387473
Change-Id: If5db1614ef455e2f1eae1d36cf514e13e7aab993
This commit is contained in:
Sorin Basca
2022-01-23 09:01:07 +00:00
parent b62248a6aa
commit 18ecf61090
5 changed files with 4 additions and 35 deletions

View File

@@ -1392,10 +1392,6 @@ func (module *SdkLibrary) createStubsLibrary(mctx android.DefaultableHookContext
Srcs []string
Javacflags []string
}
Openjdk11 struct {
Srcs []string
Javacflags []string
}
Dist struct {
Targets []string
Dest *string
@@ -1422,8 +1418,6 @@ func (module *SdkLibrary) createStubsLibrary(mctx android.DefaultableHookContext
}
props.Openjdk9.Srcs = module.properties.Openjdk9.Srcs
props.Openjdk9.Javacflags = module.properties.Openjdk9.Javacflags
props.Openjdk11.Srcs = module.properties.Openjdk11.Srcs
props.Openjdk11.Javacflags = module.properties.Openjdk11.Javacflags
// We compile the stubs for 1.8 in line with the main android.jar stubs, and potential
// interop with older developer tools that don't support 1.9.
props.Java_version = proptools.StringPtr("1.8")