Merge "Update go.mod and go.work to 1.21" into main
diff --git a/OWNERS b/OWNERS
index e5374ed..58edc89 100644
--- a/OWNERS
+++ b/OWNERS
@@ -3,29 +3,13 @@
# approving build related projects.
# AMER
-agespino@google.com #{LAST_RESORT_SUGGESTION}
ccross@android.com
colefaust@google.com
-cparsons@google.com #{LAST_RESORT_SUGGESTION}
-dacek@google.com #{LAST_RESORT_SUGGESTION}
-delmerico@google.com #{LAST_RESORT_SUGGESTION}
dwillemsen@google.com
-eakammer@google.com #{LAST_RESORT_SUGGESTION}
jihoonkang@google.com
-jobredeaux@google.com #{LAST_RESORT_SUGGESTION}
joeo@google.com
-juu@google.com #{LAST_RESORT_SUGGESTION}
lamontjones@google.com
mrziwang@google.com
spandandas@google.com
-tradical@google.com #{LAST_RESORT_SUGGESTION}
-usta@google.com #{LAST_RESORT_SUGGESTION}
-vinhdaitran@google.com #{LAST_RESORT_SUGGESTION}
weiwli@google.com
-yudiliu@google.com
-
-# APAC
-jingwen@google.com #{LAST_RESORT_SUGGESTION}
-
-# EMEA
-lberki@google.com #{LAST_RESORT_SUGGESTION}
+yudiliu@google.com
\ No newline at end of file
diff --git a/android/config.go b/android/config.go
index a69adc3..0aad3bd 100644
--- a/android/config.go
+++ b/android/config.go
@@ -691,6 +691,7 @@
"framework-location": {},
"framework-media": {},
"framework-mediaprovider": {},
+ "framework-nfc": {},
"framework-ondevicepersonalization": {},
"framework-pdf": {},
"framework-permission": {},
diff --git a/cc/config/global.go b/cc/config/global.go
index bc067ad..8b6df30 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -359,7 +359,7 @@
CStdVersion = "gnu17"
CppStdVersion = "gnu++20"
ExperimentalCStdVersion = "gnu2x"
- ExperimentalCppStdVersion = "gnu++2a"
+ ExperimentalCppStdVersion = "gnu++2b"
// prebuilts/clang default settings.
ClangDefaultBase = "prebuilts/clang/host"
diff --git a/genrule/allowlists.go b/genrule/allowlists.go
index d8819b2..65e4d88 100644
--- a/genrule/allowlists.go
+++ b/genrule/allowlists.go
@@ -26,7 +26,6 @@
"CtsApkVerityTestDebugFiles",
"aidl_camera_build_version",
"camera-its",
- "libcore-non-cts-tests-txt",
// 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.