diff options
| author | 2023-12-15 19:01:34 +0000 | |
|---|---|---|
| committer | 2023-12-15 19:01:34 +0000 | |
| commit | 6482cb97cd9d51697990c74d54b1c8790c20bf69 (patch) | |
| tree | 71561a5cfe5f22e1813299a8f855c1c928d857b8 /java/dex.go | |
| parent | a6bc7c87bdcd027e5391792cd0d8c368418f2cf7 (diff) | |
| parent | a33691288e3ff4e17d746bacbaf9196628aa3ef1 (diff) | |
Merge "Revert^5 "Enable dex container (DEX v41) for the whole system"" into main
Diffstat (limited to 'java/dex.go')
| -rw-r--r-- | java/dex.go | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/java/dex.go b/java/dex.go index 91c245281..6f1c09d57 100644 --- a/java/dex.go +++ b/java/dex.go @@ -223,13 +223,6 @@ 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. |