From 5d0d089a72c57c7c6d81e59bdedf5295df29d13d Mon Sep 17 00:00:00 2001
From: Adnan Begovic <adnan@cyngn.com>
Date: Mon, 6 Jul 2015 20:06:36 -0700
Subject: androidfw: Declare and load cmsdk resource package w/ id.

Change-Id: I63b8f3e4a938896dd21999c5b4470573a1da2e52
---
 tools/aapt/ResourceTable.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'tools/aapt/ResourceTable.cpp')

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)));
         }
     }
-- 
cgit v1.1