Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf6be333 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Rename T to Tiramisu" into sc-dev-plus-aosp am: 001565f2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340845

Change-Id: Icea8a266c1a5ca1c3b91680e9f0bf942c215623a
parents 9ddaf7f8 001565f2

tools/aapt2/SdkConstants.cpp

+2 −3
Original line number Original line Diff line number Diff line
@@ -26,9 +26,8 @@ using android::StringPiece; 
namespace aapt {

namespace aapt {





static ApiVersion sDevelopmentSdkLevel = 10000;

static ApiVersion sDevelopmentSdkLevel = 10000;

static const auto sDevelopmentSdkCodeNames = std::unordered_set<StringPiece>({

static const auto sDevelopmentSdkCodeNames =

    "Q", "R", "S", "T"

    std::unordered_set<StringPiece>({"Q", "R", "S", "Tiramisu"});

});





static const std::vector<std::pair<uint16_t, ApiVersion>> sAttrIdMap = {

static const std::vector<std::pair<uint16_t, ApiVersion>> sAttrIdMap = {

    {0x021c, 1},

    {0x021c, 1},