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

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

Add VanillaIceCream to aapt2 codenames am: 1dd09eb7 am: 7dc9b3e8 

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



Change-Id: Id72ba22988160a91f13e41bbe26be992a807d81f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9300834f 7dc9b3e8

tools/aapt2/SdkConstants.cpp

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

namespace aapt {





static ApiVersion sDevelopmentSdkLevel = 10000;

static ApiVersion sDevelopmentSdkLevel = 10000;

static const auto sDevelopmentSdkCodeNames =

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

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

    {"Q", "R", "S", "Sv2", "Tiramisu", "UpsideDownCake", "VanillaIceCream"});





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

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

    {0x021c, 1},

    {0x021c, 1},