diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2020-04-15 15:10:14 -0700 |
|---|---|---|
| committer | Svet Ganov <svetoslavganov@google.com> | 2020-05-03 09:58:54 -0700 |
| commit | 38cd221d8114fb19b37249653df23722ce209454 (patch) | |
| tree | 1f0928f3fc3e341d0dad2fbafd4dece8bd8b2e49 /tools/aapt2 | |
| parent | 495fd8e5495e42e78fb003ad18b0148775889909 (diff) | |
Updating platform SDK version for R
* Finalize resources
* Update appt/aapt2 constants
* Update R and SDK constants
* Fix a crashloop bug
Test: build + boot
bug:150281259
Change-Id: Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d
Merged-In: Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d
Diffstat (limited to 'tools/aapt2')
| -rw-r--r-- | tools/aapt2/SdkConstants.cpp | 2 | ||||
| -rw-r--r-- | tools/aapt2/SdkConstants.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/tools/aapt2/SdkConstants.cpp b/tools/aapt2/SdkConstants.cpp index b4b6ff1daaaa..f9faed84f5f0 100644 --- a/tools/aapt2/SdkConstants.cpp +++ b/tools/aapt2/SdkConstants.cpp @@ -57,6 +57,8 @@ static const std::vector<std::pair<uint16_t, ApiVersion>> sAttrIdMap = { {0x0568, SDK_O}, {0x056d, SDK_O_MR1}, {0x0586, SDK_P}, + {0x0606, SDK_Q}, + {0x0617, SDK_R}, }; static bool less_entry_id(const std::pair<uint16_t, ApiVersion>& p, uint16_t entryId) { diff --git a/tools/aapt2/SdkConstants.h b/tools/aapt2/SdkConstants.h index a00d978565ad..aa9aa12d2cee 100644 --- a/tools/aapt2/SdkConstants.h +++ b/tools/aapt2/SdkConstants.h @@ -55,6 +55,7 @@ enum : ApiVersion { SDK_O_MR1 = 27, SDK_P = 28, SDK_Q = 29, + SDK_R = 30, }; ApiVersion FindAttributeSdkLevel(const ResourceId& id); |