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

Commit d5f12360 authored by Michael Wright's avatar Michael Wright Committed by Automerger Merge Worker
Browse files

Merge "Update AAPT for S V2." into sc-v2-dev am: af23af4c 

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

Change-Id: I6b713a4e45e82d2a0ed2a117d505cbd84aea4175
parents b91f1f4e af23af4c

tools/aapt/SdkConstants.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ enum { 
    SDK_Q = 29,

    SDK_R = 30,

    SDK_S = 31,

    SDK_S_V2 = 32,

};



#endif // H_AAPT_SDK_CONSTANTS

tools/aapt2/SdkConstants.cpp

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ static const std::vector<std::pair<uint16_t, ApiVersion>> sAttrIdMap = { 
    {0x0606, SDK_Q},

    {0x0616, SDK_R},

    {0x064b, SDK_S},

    {0x064c, SDK_S_V2},

};



static bool less_entry_id(const std::pair<uint16_t, ApiVersion>& p, uint16_t entryId) {

tools/aapt2/SdkConstants.h

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ enum : ApiVersion { 
  SDK_Q = 29,

  SDK_R = 30,

  SDK_S = 31,

  SDK_S_V2 = 32,

};



ApiVersion FindAttributeSdkLevel(const ResourceId& id);