diff options
| author | Adnan Begovic <adnan@cyngn.com> | 2015-07-06 20:06:36 -0700 |
|---|---|---|
| committer | Adnan Begovic <adnan@cyngn.com> | 2015-10-12 18:07:33 -0700 |
| commit | 5d0d089a72c57c7c6d81e59bdedf5295df29d13d (patch) | |
| tree | d960f83f76234e291780dbe38f2b183309062bdb /tools/aapt | |
| parent | 62a8f713e7e1d497fe6f1e46d5d4e38d2a51f9bb (diff) | |
| download | frameworks_base-5d0d089a72c57c7c6d81e59bdedf5295df29d13d.zip frameworks_base-5d0d089a72c57c7c6d81e59bdedf5295df29d13d.tar.gz frameworks_base-5d0d089a72c57c7c6d81e59bdedf5295df29d13d.tar.bz2 | |
androidfw: Declare and load cmsdk resource package w/ id.
Change-Id: I63b8f3e4a938896dd21999c5b4470573a1da2e52
Diffstat (limited to 'tools/aapt')
| -rw-r--r-- | tools/aapt/ResourceTable.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index d5a09d8..1f736d0 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -2825,8 +2825,9 @@ status_t ResourceTable::flatten(Bundle* bundle, const sp<const ResourceFilter>& for (size_t i = 0; i < basePackageCount; i++) { size_t packageId = table.getBasePackageId(i); String16 packageName(table.getBasePackageName(i)); - if (packageId > 0x01 && packageId != 0x7f && - packageName != String16("android")) { + if (packageId > 0x01 && packageId != 0x7f && packageId != 0x3f && + packageName != String16("android") + && packageName != String16("cyanogenmod.platform")) { libraryPackages.add(sp<Package>(new Package(packageName, packageId))); } } |