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

Commit 7907c653 authored by Mark Punzalan's avatar Mark Punzalan
Browse files

aapt2: Support "CANARY" as a development codename 

Bug: 427283392
Flag: EXEMPT bugfix
Test: atest aapt2_tests
Test: Manual:
- Flashed device with Canary FRC build
- Used custom aapt2 with these changes in AGP
- Built and ran the app on device

Change-Id: Idd768a46c412cdc0ae66a8dcb8c30d40c3c8a706
parent 0bb87e65

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) {