From 6a7d2757a936ee79b8dba2055139c8b71130c58e Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Thu, 7 Aug 2014 21:26:53 -0700 Subject: Use the correct versionCode for Split APKs Insert the correct versionCode into the generated Split AndroidManifest.xml. Change-Id: I0aec797b5a4ff8bd70f9394b18aee5ad292b37c8 --- tools/aapt/Resource.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'tools/aapt/Resource.cpp') diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp index 0a808059a56d..869a6fc0b9c5 100644 --- a/tools/aapt/Resource.cpp +++ b/tools/aapt/Resource.cpp @@ -770,7 +770,14 @@ status_t massageManifest(Bundle* bundle, sp 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; -- cgit v1.2.3-59-g8ed1b