Fix SDK version codes in ART w.r.t. API levels 32 and 33.
Define the SDK version codes for API level 32 as "S V2" (Android 12L)
and for API level 33 as "T" (Android 13), as per
https://developer.android.com/studio/releases/platforms.
Retain the existing behavior regarding numeric version codes in users
in the ART code base.
Test: Run ART gtests and run-tests
Change-Id: I07cf3cbc230afdc5d33eb13af0a71c845b22782e
diff --git a/libartbase/base/sdk_version.h b/libartbase/base/sdk_version.h
index 07c3c2c..d39aa95 100644
--- a/libartbase/base/sdk_version.h
+++ b/libartbase/base/sdk_version.h
@@ -36,7 +36,8 @@
kQ = 29u,
kR = 30u,
kS = 31u,
- kT = 32u,
+ kS_V2 = 32u,
+ kT = 33u,
kMax = std::numeric_limits<uint32_t>::max(),
};
diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc
index ec0ac73..2f996f8 100644
--- a/runtime/verifier/method_verifier.cc
+++ b/runtime/verifier/method_verifier.cc
@@ -4899,7 +4899,7 @@
template <bool kVerifierDebug>
bool MethodVerifier<kVerifierDebug>::PotentiallyMarkRuntimeThrow() {
- if (IsAotMode() || IsSdkVersionSetAndAtLeast(api_level_, SdkVersion::kT)) {
+ if (IsAotMode() || IsSdkVersionSetAndAtLeast(api_level_, SdkVersion::kS_V2)) {
return false;
}
// Compatibility mode: we treat the following code unreachable and the verifier