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

Commit ceb33427 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android (Google) Code Review
Browse files

Merge "Use the correct versionCode for Split APKs" into lmp-dev

parents 491cb3f5 6a7d2757

tools/aapt/Resource.cpp

+7 −0
Original line number Diff line number Diff line
@@ -770,7 +770,14 @@ status_t massageManifest(Bundle* bundle, sp<XMLNode> root) 
    if (!addTagAttribute(root, RESOURCES_ANDROID_NAMESPACE, "versionCode",

            bundle->getVersionCode(), errorOnFailedInsert, replaceVersion)) {

        return UNKNOWN_ERROR;

    } else {

        const XMLNode::attribute_entry* attr = root->getAttribute(

                String16(RESOURCES_ANDROID_NAMESPACE), String16("versionCode"));

        if (attr != NULL) {

            bundle->setVersionCode(strdup(String8(attr->string).string()));

        }

    }



    if (!addTagAttribute(root, RESOURCES_ANDROID_NAMESPACE, "versionName",

            bundle->getVersionName(), errorOnFailedInsert, replaceVersion)) {

        return UNKNOWN_ERROR;