diff options
| -rw-r--r-- | java/dex.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/java/dex.go b/java/dex.go index 6f1c09d57..91c245281 100644 --- a/java/dex.go +++ b/java/dex.go @@ -223,6 +223,13 @@ func (d *dexer) dexCommonFlags(ctx android.ModuleContext, if err != nil { ctx.PropertyErrorf("min_sdk_version", "%s", err) } + if effectiveVersion.FinalOrFutureInt() >= 35 { + // V is 35, but we have not bumped the SDK version yet, so check for both. + if ctx.Config().PlatformSdkVersion().FinalInt() >= 35 || + ctx.Config().PlatformSdkCodename() == "VanillaIceCream" { + flags = append([]string{"-JDcom.android.tools.r8.dexContainerExperiment"}, flags...) + } + } // If the specified SDK level is 10000, then configure the compiler to use the // current platform SDK level and to compile the build as a platform build. |