diff options
| author | 2021-12-21 07:37:46 +0000 | |
|---|---|---|
| committer | 2021-12-21 07:37:46 +0000 | |
| commit | 55f84a74c5b824f9ff5e5b320fc8fc598f25f46d (patch) | |
| tree | cd184b06892f89795ee54be4f3feeb5d1ad27041 /java/sdk_library.go | |
| parent | 1778546f7a861884e83b4d1593c8e5ea796fd708 (diff) | |
| parent | 9347ae3ba06363a6a8268d6e587f7dcff4e76c38 (diff) | |
Merge "Adding option to include sources only for Java 11 builds"
Diffstat (limited to 'java/sdk_library.go')
| -rw-r--r-- | java/sdk_library.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/java/sdk_library.go b/java/sdk_library.go index b8ab69abb..0bc8895fe 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -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") |