commit 923d72afc9f4506086a30ef44b177f9ae2acd7c0
author Steven Moreland <smoreland@google.com> Fri Mar 17 00:11:42 2023 +0000
committer Steven Moreland <smoreland@google.com> Fri Mar 17 00:11:42 2023 +0000
tree 8ca02e296057d0ea055684c65c21c53626802e94
parent 27e1929cd06a89878ce59b0fdf3be2f635d221ff

aidl: add UpsideDownCake codename

Fixes: 274004903
Test: aidl_unittests
Change-Id: Iaae6055a410dace9a58fa94ca5185e780a024e25

options.cpp

diff --git a/options.cpp b/options.cpp
index 924f1ee..367c7ba 100644
--- a/options.cpp
+++ b/options.cpp
@@ -198,6 +198,7 @@
 static const std::map<std::string, uint32_t> codeNameToVersion = {
     {"S", 31},
     {"Tiramisu", SDK_VERSION_Tiramisu},
+    {"UpsideDownCake", SDK_VERSION_UpsideDownCake},
     // this is an alias for the latest in-development platform version
     {"current", SDK_VERSION_current},
     // this is an alias for use of all APIs, including those not in any API surface

options.h

diff --git a/options.h b/options.h
index b3a7c34..c15c710 100644
--- a/options.h
+++ b/options.h
@@ -40,6 +40,7 @@
 
 constexpr uint32_t SDK_VERSION_current = 10000;
 constexpr uint32_t SDK_VERSION_Tiramisu = 33;
+constexpr uint32_t SDK_VERSION_UpsideDownCake = 34;
 
 constexpr uint32_t JAVA_PROPAGATE_VERSION = SDK_VERSION_Tiramisu;
 

options_unittest.cpp

diff --git a/options_unittest.cpp b/options_unittest.cpp
index 2931bc6..4bec8a7 100644
--- a/options_unittest.cpp
+++ b/options_unittest.cpp
@@ -454,7 +454,7 @@
   EXPECT_EQ(30u, options->GetMinSdkVersion());
 }
 
-TEST(OptionsTests, AcceptCodeNameAsMinSdkVersion) {
+TEST(OptionsTests, AcceptTCodeNameAsMinSdkVersion) {
   const char* args[] = {
       "aidl", "--lang=java", "--min_sdk_version=Tiramisu", "--out=out", "input.aidl", nullptr,
   };
@@ -463,6 +463,15 @@
   EXPECT_EQ(33u, options->GetMinSdkVersion());
 }
 
+TEST(OptionsTests, AcceptUCodeNameAsMinSdkVersion) {
+  const char* args[] = {
+      "aidl", "--lang=java", "--min_sdk_version=UpsideDownCake", "--out=out", "input.aidl", nullptr,
+  };
+  auto options = GetOptions(args);
+  EXPECT_TRUE(options->Ok());
+  EXPECT_EQ(34u, options->GetMinSdkVersion());
+}
+
 TEST(OptionsTest, DefaultMinSdkVersion) {
   const char* args[] = {
       "aidl", "--lang=java", "--out=out", "input.aidl", nullptr,