commit dc1275ca875479c6d1467e018d27e6a41c7d4069
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 28 05:46:25 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Apr 28 05:46:25 2022 +0000
tree 0977d63cf87a9556f7470fec58c6a545da77cf61
parent b069a9a31a6c35833c3782b9a2f282a5dc8e0cae
parent d7b4c385fcc959fa115501e6207cfaa92f44e64b

Merge "finalize Tiramisu SDK version (33)" into tm-dev am: b371a0e5b9 am: d7b4c385fc

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

Change-Id: Ia60e626f3f6deca7e2c4bd776f3ed0730835793c
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) {