Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AAPT2: Update SDK development codename to Q

Browse Source 
am: ad5b4ba2a2

Change-Id: Ief47a337a79c4b2ae8cfa27bcbe5cc75f18c4887
This commit is contained in:
Ryan Mitchell
2019-04-19 19:10:25 -07:00
committed by android-build-merger
parent 18e97c3db5 ad5b4ba2a2
commit 1661ba8138
2 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/aapt2/SdkConstants.cpp
View File

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

31
tools/aapt2/configuration/ConfigurationParser_test.cpp
View File

@@ -705,35 +705,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) {