Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AAPT: Fix feature split generation of ID resources am: 4d219da3c4

Browse Source 
am: e69f9ca938

Change-Id: I2021dbffcd9e6fb8bca79c181d2bf8e8524ee5d2
This commit is contained in:
Adam Lesinski
2016-08-04 02:00:28 +00:00
committed by android-build-merger
parent 027a598c24 e69f9ca938
commit 84877752ee
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/aapt/ResourceTable.cpp
View File

@@ -2623,6 +2623,14 @@ status_t ResourceTable::assignResourceIds()
const SourcePos unknown(String8("????"), 0); const SourcePos unknown(String8("????"), 0);
sp<Type> attr = p->getType(String16("attr"), unknown); sp<Type> attr = p->getType(String16("attr"), unknown);
// Force creation of ID if we are building feature splits.
// Auto-generated ID resources won't apply the type ID offset correctly unless
// the offset is applied here first.
// b/30607637
if (mPackageType == AppFeature && p->getName() == mAssetsPackage) {
sp<Type> id = p->getType(String16("id"), unknown);
}
// Assign indices... // Assign indices...
const size_t typeCount = p->getOrderedTypes().size(); const size_t typeCount = p->getOrderedTypes().size();
for (size_t ti = 0; ti < typeCount; ti++) { for (size_t ti = 0; ti < typeCount; ti++) {