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

Commit dc8d0be1 authored by Ryan Mitchell's avatar Ryan Mitchell Committed by Android (Google) Code Review
Browse files

Merge "AAPT2: Update SDK development codename to Q"

parents eef1b6cd eb9c9ac8

tools/aapt2/SdkConstants.cpp

+3 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ using android::StringPiece; 


namespace aapt {



static const char* sDevelopmentSdkCodeName = "P";

static ApiVersion sDevelopmentSdkLevel = 28;

static const char* sDevelopmentSdkCodeName = "Q";

static ApiVersion sDevelopmentSdkLevel = 10000;



static const std::vector<std::pair<uint16_t, ApiVersion>> sAttrIdMap = {

    {0x021c, 1},
@@ -54,6 +54,7 @@ static const std::vector<std::pair<uint16_t, ApiVersion>> sAttrIdMap = { 
    {0x0530, SDK_NOUGAT_MR1},

    {0x0568, SDK_O},

    {0x056d, SDK_O_MR1},

    {0x0586, SDK_P},

};



static bool less_entry_id(const std::pair<uint16_t, ApiVersion>& p, uint16_t entryId) {

tools/aapt2/configuration/ConfigurationParser_test.cpp

+10 −21
Original line number Diff line number Diff line
@@ -703,35 +703,24 @@ TEST_F(ConfigurationParserTest, AndroidSdkGroupAction_InvalidVersion) { 
}



TEST_F(ConfigurationParserTest, AndroidSdkGroupAction_NonNumeric) {

  static constexpr const char* xml = R"xml(

  auto doc = test::BuildXmlDom(R"xml(

      <android-sdk

          label="P"

          label="Q"

          minSdkVersion="25"

          targetSdkVersion="%s"

          maxSdkVersion="%s">

      </android-sdk>)xml";



  const auto& dev_sdk = GetDevelopmentSdkCodeNameAndVersion();

  const char* codename = dev_sdk.first.data();

  const ApiVersion& version = dev_sdk.second;



  auto doc = test::BuildXmlDom(StringPrintf(xml, codename, codename));

          targetSdkVersion="Q"

          maxSdkVersion="Q">

      </android-sdk>)xml");



  PostProcessingConfiguration config;

  bool ok = AndroidSdkTagHandler(&config, NodeCast<Element>(doc.get()->root.get()), &diag_);

  ASSERT_TRUE(ok);



  ASSERT_TRUE(AndroidSdkTagHandler(&config, NodeCast<Element>(doc.get()->root.get()), &diag_));

  ASSERT_EQ(1ul, config.android_sdks.size());

  ASSERT_EQ(1u, config.android_sdks.count("P"));



  auto& out = config.android_sdks["P"];

  ASSERT_EQ(1u, config.android_sdks.count("Q"));



  AndroidSdk sdk;

  sdk.min_sdk_version = 25;

  sdk.target_sdk_version = version;

  sdk.max_sdk_version = version;



  ASSERT_EQ(sdk, out);

  sdk.target_sdk_version = 10000;

  sdk.max_sdk_version = 10000;

  ASSERT_EQ(sdk, config.android_sdks["Q"]);

}



TEST_F(ConfigurationParserTest, GlTextureGroupAction) {