Merge "Rust protobuf 2->3: Update build system" into main
diff --git a/genrule/allowlists.go b/genrule/allowlists.go
index 8abf73e..dc2d9e6 100644
--- a/genrule/allowlists.go
+++ b/genrule/allowlists.go
@@ -25,7 +25,6 @@
// 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 91c2452..6f1c09d 100644
--- a/java/dex.go
+++ b/java/dex.go
@@ -223,13 +223,6 @@
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.