diff options
| -rw-r--r-- | genrule/allowlists.go | 1 | ||||
| -rw-r--r-- | java/dex.go | 7 |
2 files changed, 0 insertions, 8 deletions
diff --git a/genrule/allowlists.go b/genrule/allowlists.go index 8abf73e19..dc2d9e687 100644 --- a/genrule/allowlists.go +++ b/genrule/allowlists.go @@ -25,7 +25,6 @@ var ( // go/keep-sorted start "CtsApkVerityTestDebugFiles", "aidl_camera_build_version", - "camera-its", "chre_atoms_log.h", // go/keep-sorted end } 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. |