commit 4feb329534eb1e4c636da82e8ba62d841fdd5a12
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Apr 30 01:48:02 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Apr 30 01:48:02 2022 +0000
tree 0977d63cf87a9556f7470fec58c6a545da77cf61
parent f5e352f944ee90286dd5364d49813529e46530c7
parent 46b3909a7703c8e4fffcf11ac478f0bce87c79e6

Snap for 8515382 from b371a0e5b9e88c319522a6fa74e036e8fb983a0c to tm-release am: 46b3909a77

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/tools/aidl/+/18086557

Change-Id: I24d08b741e823883ed07a6185a3a824abffca226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

options.h

diff --git a/options.h b/options.h
index 204b371..5208424 100644
--- a/options.h
+++ b/options.h
@@ -39,7 +39,7 @@
 constexpr uint32_t DEFAULT_SDK_VERSION_RUST = 31;
 
 constexpr uint32_t SDK_VERSION_current = 10000;
-constexpr uint32_t SDK_VERSION_Tiramisu = SDK_VERSION_current;
+constexpr uint32_t SDK_VERSION_Tiramisu = 33;
 
 constexpr uint32_t JAVA_PROPAGATE_VERSION = SDK_VERSION_Tiramisu;
 

options_unittest.cpp

diff --git a/options_unittest.cpp b/options_unittest.cpp
index 1121402..2931bc6 100644
--- a/options_unittest.cpp
+++ b/options_unittest.cpp
@@ -454,13 +454,13 @@
   EXPECT_EQ(30u, options->GetMinSdkVersion());
 }
 
-TEST(OPtionsTests, AcceptCodeNameAsMinSdkVersion) {
+TEST(OptionsTests, AcceptCodeNameAsMinSdkVersion) {
   const char* args[] = {
       "aidl", "--lang=java", "--min_sdk_version=Tiramisu", "--out=out", "input.aidl", nullptr,
   };
   auto options = GetOptions(args);
   EXPECT_TRUE(options->Ok());
-  EXPECT_EQ(10000u, options->GetMinSdkVersion());
+  EXPECT_EQ(33u, options->GetMinSdkVersion());
 }
 
 TEST(OptionsTest, DefaultMinSdkVersion) {