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

Commit 5a8ec761 authored by Kenny Root's avatar Kenny Root
Browse files

Scan for android namespace in manifest 

android:minSdkVersion wasn't being correctly scanned because the
namespace was incorrect. This fixes that problem so packages aren't
generated as UTF-8 when minSdkVersion is less than 7.

Change-Id: I8f45d47ea886915da6a4770f6e111e6085d61bee
parent 406b09bb

tools/aapt/Resource.cpp

+2 −2
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static status_t parsePackage(Bundle* bundle, const sp<AaptAssets>& assets, 
           && code != ResXMLTree::BAD_DOCUMENT) {

        if (code == ResXMLTree::START_TAG) {

            if (strcmp16(block.getElementName(&len), uses_sdk16.string()) == 0) {

                ssize_t minSdkIndex = block.indexOfAttribute("android",

                ssize_t minSdkIndex = block.indexOfAttribute(RESOURCES_ANDROID_NAMESPACE,

                                                             "minSdkVersion");

                if (minSdkIndex >= 0) {

                    String8 minSdkString = String8(