From 4de616baaed8c08409046b59fcb0f5d8089bc610 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Fri, 15 Apr 2022 22:51:07 +0000 Subject: finalize Tiramisu SDK version (33) Ignore-AOSP-First: T release Fixes: 217620659 Test: build Change-Id: I558fc7cc424027132f3905f3ca71ddb5a592918d --- options.h | 2 +- options_unittest.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/options.h b/options.h index 204b371a..5208424a 100644 --- a/options.h +++ b/options.h @@ -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) { -- cgit v1.2.3