Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16d86466 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "aapt2: Support "CANARY" as a development codename" into main

parents f29202e9 7907c653

tools/aapt2/SdkConstants.cpp

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ static constexpr StringPiece sDevelopmentSdkCodeNames[] = { 
    "UpsideDownCake"sv,

    "VanillaIceCream"sv,

    "Baklava"sv,

    "CANARY"sv,

};

// clang-format on

tools/aapt2/SdkConstants_test.cpp

+3 −0
Original line number Diff line number Diff line
@@ -31,12 +31,15 @@ TEST(SdkConstantsTest, NonFrameworkAttributeIsSdk0) { 
TEST(SdkConstantsTest, GetDevelopmentSdkCodeNameVersionValid) {

  EXPECT_EQ(std::optional<ApiVersion>(10000), GetDevelopmentSdkCodeNameVersion("Q"));

  EXPECT_EQ(std::optional<ApiVersion>(10000), GetDevelopmentSdkCodeNameVersion("VanillaIceCream"));

  EXPECT_EQ(std::optional<ApiVersion>(10000), GetDevelopmentSdkCodeNameVersion("CANARY"));

}



TEST(SdkConstantsTest, GetDevelopmentSdkCodeNameVersionPrivacySandbox) {

  EXPECT_EQ(std::optional<ApiVersion>(10000), GetDevelopmentSdkCodeNameVersion("QPrivacySandbox"));

  EXPECT_EQ(std::optional<ApiVersion>(10000),

            GetDevelopmentSdkCodeNameVersion("VanillaIceCreamPrivacySandbox"));

  EXPECT_EQ(std::optional<ApiVersion>(10000),

            GetDevelopmentSdkCodeNameVersion("CANARYPrivacySandbox"));

}



TEST(SdkConstantsTest, GetDevelopmentSdkCodeNameVersionInvalid) {