summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
author Yanning Jia <yanning@google.com> 2024-01-04 23:03:19 +0000
committer David Srbecky <dsrbecky@google.com> 2024-01-15 11:09:32 +0000
commit43668c6f1353284426ffa5b8fa5f571f2139e5dc (patch)
tree3eeaff33d5620a576f165031b52065a3a08b77cd /java
parent7022550d0e24658c6572114eb0f265e032e0ec66 (diff)
Revert^7 "Enable dex container (DEX v41) for the whole system"
This reverts commit 7022550d0e24658c6572114eb0f265e032e0ec66. Reason for revert: Breaks app's DRM Bug: 317744117 Change-Id: I539e6ec037db1c297fe7cf85d294bebe963ab214
Diffstat (limited to 'java')
-rw-r--r--java/dex.go7
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.