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

Merge "qt-dev-plus-aosp designated for R. Update MAX_PLATFORM_VERSION, etc." into qt-dev-plus-aosp

Browse Source
This commit is contained in:
Ryan Mitchell
2019-04-15 19:07:10 +00:00
committed by Android (Google) Code Review
parent 5a2f0790ab 48002f6313
commit 9202886cbf
4 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/aapt2/ResourceUtils.cpp
View File

@@ -534,17 +534,18 @@ Maybe<int> ParseSdkVersion(const StringPiece& str) {
}
// Try parsing the code name.
std::pair<StringPiece, int> entry = GetDevelopmentSdkCodeNameAndVersion();
if (entry.first == trimmed_str) {
return entry.second;
Maybe<int> entry = GetDevelopmentSdkCodeNameVersion(trimmed_str);
if (entry) {
return entry.value();
}
// Try parsing codename from "[codename].[preview_sdk_fingerprint]" value.
const StringPiece::const_iterator begin = std::begin(trimmed_str);
const StringPiece::const_iterator end = std::end(trimmed_str);
const StringPiece::const_iterator codename_end = std::find(begin, end, '.');
if (codename_end != end && entry.first == trimmed_str.substr(begin, codename_end)) {
return entry.second;
entry = GetDevelopmentSdkCodeNameVersion(trimmed_str.substr(begin, codename_end));
if (entry) {
return entry.value();
}
return {};
}

15
tools/aapt2/ResourceUtils_test.cpp
View File

@@ -214,14 +214,15 @@ TEST(ResourceUtilsTest, ItemsWithWhitespaceAreParsedCorrectly) {
}
TEST(ResourceUtilsTest, ParseSdkVersionWithCodename) {
const android::StringPiece codename =
GetDevelopmentSdkCodeNameAndVersion().first;
const int version = GetDevelopmentSdkCodeNameAndVersion().second;
EXPECT_THAT(ResourceUtils::ParseSdkVersion(codename), Eq(Maybe<int>(version)));
EXPECT_THAT(ResourceUtils::ParseSdkVersion("Q"), Eq(Maybe<int>(10000)));
EXPECT_THAT(
ResourceUtils::ParseSdkVersion(codename.to_string() + ".fingerprint"),
Eq(Maybe<int>(version)));
ResourceUtils::ParseSdkVersion("Q.fingerprint"),
Eq(Maybe<int>(10000)));
EXPECT_THAT(ResourceUtils::ParseSdkVersion("R"), Eq(Maybe<int>(10000)));
EXPECT_THAT(
ResourceUtils::ParseSdkVersion("R.fingerprint"),
Eq(Maybe<int>(10000)));
}
TEST(ResourceUtilsTest, StringBuilderWhitespaceRemoval) {

11
tools/aapt2/SdkConstants.cpp
View File

@@ -18,15 +18,17 @@
#include <algorithm>
#include <string>
#include <unordered_map>
#include <unordered_set>
#include <vector>
using android::StringPiece;
namespace aapt {
static const char* sDevelopmentSdkCodeName = "Q";
static ApiVersion sDevelopmentSdkLevel = 10000;
static const auto sDevelopmentSdkCodeNames = std::unordered_set<StringPiece>({
"Q", "R"
});
static const std::vector<std::pair<uint16_t, ApiVersion>> sAttrIdMap = {
{0x021c, 1},
@@ -72,8 +74,9 @@ ApiVersion FindAttributeSdkLevel(const ResourceId& id) {
return iter->second;
}
std::pair<StringPiece, ApiVersion> GetDevelopmentSdkCodeNameAndVersion() {
return std::make_pair(StringPiece(sDevelopmentSdkCodeName), sDevelopmentSdkLevel);
Maybe<ApiVersion> GetDevelopmentSdkCodeNameVersion(const StringPiece& code_name) {
return (sDevelopmentSdkCodeNames.find(code_name) == sDevelopmentSdkCodeNames.end())
? Maybe<ApiVersion>() : sDevelopmentSdkLevel;
}
} // namespace aapt

2
tools/aapt2/SdkConstants.h
View File

@@ -57,7 +57,7 @@ enum : ApiVersion {
};
ApiVersion FindAttributeSdkLevel(const ResourceId& id);
std::pair<android::StringPiece, ApiVersion> GetDevelopmentSdkCodeNameAndVersion();
Maybe<ApiVersion> GetDevelopmentSdkCodeNameVersion(const android::StringPiece& code_name);
} // namespace aapt