Revert "Setting Java 11 as the default version"
Revert submission 1944928-default-java11 Reason for revert: Post-submit failures Reverted Changes: Ia9a0aa2a4:Setting Java 11 as the default version Ibf5d10521:Setting Java 11 as the default version Fixes: 215504708 Fixes: 215502091 Fixes: 215502091 Change-Id: I2f9866deff41406aede24758f6eda5e5808c7f29
This commit is contained in:
@@ -1392,6 +1392,10 @@ func (module *SdkLibrary) createStubsLibrary(mctx android.DefaultableHookContext
|
||||
Srcs []string
|
||||
Javacflags []string
|
||||
}
|
||||
Openjdk11 struct {
|
||||
Srcs []string
|
||||
Javacflags []string
|
||||
}
|
||||
Dist struct {
|
||||
Targets []string
|
||||
Dest *string
|
||||
@@ -1418,6 +1422,8 @@ 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")
|
||||
|
Reference in New Issue
Block a user