diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-29 04:49:45 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-29 04:49:45 +0000 |
commit | 46b3909a7703c8e4fffcf11ac478f0bce87c79e6 (patch) | |
tree | 0977d63cf87a9556f7470fec58c6a545da77cf61 | |
parent | 63c77c99cde76a42cbfde303a4eb7ac18e8e7787 (diff) | |
parent | b371a0e5b9e88c319522a6fa74e036e8fb983a0c (diff) | |
download | aidl-46b3909a7703c8e4fffcf11ac478f0bce87c79e6.tar.gz |
Snap for 8515382 from b371a0e5b9e88c319522a6fa74e036e8fb983a0c to tm-releaseandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-vts-13.0_r1android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r18android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-13.0.0_r2android-platform-13.0.0_r1android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-tests-releaseandroid13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-release
Change-Id: I8582bbe317a47e80f2ec96302e92f073204c6e5f
-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) { |