diff options
| author | 2022-01-25 05:51:25 +0000 | |
|---|---|---|
| committer | 2022-01-25 05:51:25 +0000 | |
| commit | eb76d218e99e2d6de2e348565dd35d0ece83f0f9 (patch) | |
| tree | e08913b441218d6404d0b49c7a1b233da976f524 /java/sdk_library.go | |
| parent | a1f50efd3a03b6eb583baf11596df628e9e5c242 (diff) | |
| parent | 18ecf61090cd987e049aadfea6371ea4ca651b06 (diff) | |
Merge "Revert^2: "Setting Java 11 as the default version""
Diffstat (limited to 'java/sdk_library.go')
| -rw-r--r-- | java/sdk_library.go | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/java/sdk_library.go b/java/sdk_library.go index 7849f96f5..57ab2686f 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -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") |