diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/droidstubs.go | 4 | ||||
| -rw-r--r-- | java/testing.go | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/java/droidstubs.go b/java/droidstubs.go index caad6883e..24dabdb36 100644 --- a/java/droidstubs.go +++ b/java/droidstubs.go @@ -565,7 +565,9 @@ func (d *Droidstubs) apiLevelsAnnotationsFlags(ctx android.ModuleContext, cmd *a } if apiVersions != nil { cmd.FlagWithArg("--current-version ", ctx.Config().PlatformSdkVersion().String()) - cmd.FlagWithArg("--current-codename ", ctx.Config().PlatformSdkCodename()) + if ctx.Config().PlatformSdkVersion().String() != "36" || ctx.Config().PlatformSdkCodename() != "Baklava" { + cmd.FlagWithArg("--current-codename ", ctx.Config().PlatformSdkCodename()) + } cmd.FlagWithInput("--apply-api-levels ", apiVersions) } } diff --git a/java/testing.go b/java/testing.go index b3e552658..0a032526c 100644 --- a/java/testing.go +++ b/java/testing.go @@ -424,7 +424,6 @@ func gatherRequiredDepsForTest() string { "kotlin-stdlib-jdk8", "kotlin-annotations", "stub-annotations", - "aconfig-annotations-lib", "aconfig_storage_stub", "unsupportedappusage", |