drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AAPT: Copy android:revisionCode to Splits" into lmp-mr1-dev

Browse Source
This commit is contained in:
Adam Lesinski
2014-12-16 17:50:02 +00:00
committed by Android (Google) Code Review
parent d8ce65c9b5 54de298c01
commit f1f179a765
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/aapt/Bundle.h
View File

@ -179,6 +179,8 @@ public:
void setVersionName(const char* val) { mVersionName = val; } void setVersionName(const char* val) { mVersionName = val; }
bool getReplaceVersion() { return mReplaceVersion; } bool getReplaceVersion() { return mReplaceVersion; }
void setReplaceVersion(bool val) { mReplaceVersion = val; } void setReplaceVersion(bool val) { mReplaceVersion = val; }
const android::String8& getRevisionCode() { return mRevisionCode; }
void setRevisionCode(const char* val) { mRevisionCode = android::String8(val); }
const char* getCustomPackage() const { return mCustomPackage; } const char* getCustomPackage() const { return mCustomPackage; }
void setCustomPackage(const char* val) { mCustomPackage = val; } void setCustomPackage(const char* val) { mCustomPackage = val; }
const char* getExtraPackages() const { return mExtraPackages; } const char* getExtraPackages() const { return mExtraPackages; }
@ -297,6 +299,7 @@ private:
android::String8 mFeatureOfPackage; android::String8 mFeatureOfPackage;
android::String8 mFeatureAfterPackage; android::String8 mFeatureAfterPackage;
android::String8 mRevisionCode;
const char* mManifestMinSdkVersion; const char* mManifestMinSdkVersion;
const char* mMinSdkVersion; const char* mMinSdkVersion;
const char* mTargetSdkVersion; const char* mTargetSdkVersion;

13
tools/aapt/Resource.cpp
View File

@ -257,6 +257,11 @@ static status_t parsePackage(Bundle* bundle, const sp<AaptAssets>& assets,
assets->setPackage(String8(block.getAttributeStringValue(nameIndex, &len))); assets->setPackage(String8(block.getAttributeStringValue(nameIndex, &len)));
ssize_t revisionCodeIndex = block.indexOfAttribute(RESOURCES_ANDROID_NAMESPACE, "revisionCode");
if (revisionCodeIndex >= 0) {
bundle->setRevisionCode(String8(block.getAttributeStringValue(revisionCodeIndex, &len)).string());
}
String16 uses_sdk16("uses-sdk"); String16 uses_sdk16("uses-sdk");
while ((code=block.next()) != ResXMLTree::END_DOCUMENT while ((code=block.next()) != ResXMLTree::END_DOCUMENT
&& code != ResXMLTree::BAD_DOCUMENT) { && code != ResXMLTree::BAD_DOCUMENT) {
@ -1075,6 +1080,14 @@ status_t generateAndroidManifestForSplit(Bundle* bundle, const sp<AaptAssets>& a
return UNKNOWN_ERROR; return UNKNOWN_ERROR;
} }
// Add the 'revisionCode' attribute, which is set to the original revisionCode.
if (bundle->getRevisionCode().size() > 0) {
if (!addTagAttribute(manifest, RESOURCES_ANDROID_NAMESPACE, "revisionCode",
bundle->getRevisionCode().string(), true, true)) {
return UNKNOWN_ERROR;
}
}
// Add the 'split' attribute which describes the configurations included. // Add the 'split' attribute which describes the configurations included.
String8 splitName("config."); String8 splitName("config.");
splitName.append(split->getPackageSafeName()); splitName.append(split->getPackageSafeName());