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

Commit f4e89b48 authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Automerger Merge Worker
Browse files

Merge changes from topic "V-udc-dev-plus-aosp" into udc-dev-plus-aosp am: 48857bdb 

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



Change-Id: I5448754522ed9e8d50d0d25c0a0b98565fc8a958
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 652c19eb 48857bdb

tools/aapt2/SdkConstants.cpp

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



static ApiVersion sDevelopmentSdkLevel = 10000;

static const auto sDevelopmentSdkCodeNames =

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

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

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



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

    {0x021c, 1},