diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2020-04-15 15:10:14 -0700 |
|---|---|---|
| committer | Svet Ganov <svetoslavganov@google.com> | 2020-05-02 14:26:57 -0700 |
| commit | 87ccbfaa4638773f55854e8b2ca3d4c6b1ea57f7 (patch) | |
| tree | 68339efd7eeb5140ef5f52e7c9a699ecfcdf5955 /tools | |
| parent | a4faa6608f5a7008cbab201ee2af48590da106ec (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
Exempt-From-Owner-Approval: merge conflict resolution
Change-Id: Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d
Merged-In: Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt/SdkConstants.h | 1 | ||||
| -rw-r--r-- | tools/aapt2/SdkConstants.cpp | 2 | ||||
| -rw-r--r-- | tools/aapt2/SdkConstants.h | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/tools/aapt/SdkConstants.h b/tools/aapt/SdkConstants.h index 27ffcdf52168..04fbbe1f1069 100644 --- a/tools/aapt/SdkConstants.h +++ b/tools/aapt/SdkConstants.h @@ -45,6 +45,7 @@ enum { SDK_O_MR1 = 27, SDK_P = 28, SDK_Q = 29, + SDK_R = 30, }; #endif // H_AAPT_SDK_CONSTANTS diff --git a/tools/aapt2/SdkConstants.cpp b/tools/aapt2/SdkConstants.cpp index 304bc4925831..e8873bf2d81b 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); |