diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-04-28 03:26:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-04-28 03:26:01 +0000 |
| commit | b371a0e5b9e88c319522a6fa74e036e8fb983a0c (patch) | |
| tree | 0977d63cf87a9556f7470fec58c6a545da77cf61 | |
| parent | 8ea12a4ace303f9c782535e6be2f353555d4122c (diff) | |
| parent | 4de616baaed8c08409046b59fcb0f5d8089bc610 (diff) | |
| download | aidl-b371a0e5b9e88c319522a6fa74e036e8fb983a0c.tar.gz | |
Merge "finalize Tiramisu SDK version (33)" into tm-devt_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android13-frc-odp-releaseandroid13-dev
| -rw-r--r-- | options.h | 2 | ||||
| -rw-r--r-- | options_unittest.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -39,7 +39,7 @@ constexpr uint32_t DEFAULT_SDK_VERSION_NDK = 29; 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; diff --git a/options_unittest.cpp b/options_unittest.cpp index 1121402d..2931bc60 100644 --- a/options_unittest.cpp +++ b/options_unittest.cpp @@ -454,13 +454,13 @@ TEST(OptionsTest, AcceptValidMinSdkVersion) { 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) { |