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

Merge "Update AAPT for S V2." into sc-v2-dev

Browse Source
This commit is contained in:
Michael Wright
2021-11-06 15:52:25 +00:00
committed by Android (Google) Code Review
parent 984af19cf9 6aa3b2c86d
commit af23af4c83
3 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/aapt/SdkConstants.h
View File

@@ -47,6 +47,7 @@ enum {
SDK_Q = 29, SDK_Q = 29,
SDK_R = 30, SDK_R = 30,
SDK_S = 31, SDK_S = 31,
SDK_S_V2 = 32,
}; };
#endif // H_AAPT_SDK_CONSTANTS #endif // H_AAPT_SDK_CONSTANTS

1
tools/aapt2/SdkConstants.cpp
View File

@@ -60,6 +60,7 @@ static const std::vector<std::pair<uint16_t, ApiVersion>> sAttrIdMap = {
{0x0606, SDK_Q}, {0x0606, SDK_Q},
{0x0616, SDK_R}, {0x0616, SDK_R},
{0x064b, SDK_S}, {0x064b, SDK_S},
{0x064c, SDK_S_V2},
}; };
static bool less_entry_id(const std::pair<uint16_t, ApiVersion>& p, uint16_t entryId) { static bool less_entry_id(const std::pair<uint16_t, ApiVersion>& p, uint16_t entryId) {

1
tools/aapt2/SdkConstants.h
View File

@@ -57,6 +57,7 @@ enum : ApiVersion {
SDK_Q = 29, SDK_Q = 29,
SDK_R = 30, SDK_R = 30,
SDK_S = 31, SDK_S = 31,
SDK_S_V2 = 32,
}; };
ApiVersion FindAttributeSdkLevel(const ResourceId& id); ApiVersion FindAttributeSdkLevel(const ResourceId& id);