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 /libs/androidfw | |
| 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 'libs/androidfw')
| -rw-r--r-- | libs/androidfw/AssetManager.cpp | 6 | ||||
| -rw-r--r-- | libs/androidfw/ResourceTypes.cpp | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp index 2dc1c96..ed7808a 100644 --- a/libs/androidfw/AssetManager.cpp +++ b/libs/androidfw/AssetManager.cpp @@ -75,6 +75,7 @@ static const char* kDefaultVendor = "default"; static const char* kAssetsRoot = "assets"; static const char* kAppZipName = NULL; //"classes.jar"; static const char* kSystemAssets = "framework/framework-res.apk"; +static const char* kCMSDKAssets = "framework/org.cyanogenmod.platform-res.apk"; static const char* kResourceCache = "resource-cache"; static const char* kAndroidManifest = "AndroidManifest.xml"; @@ -340,7 +341,10 @@ bool AssetManager::addDefaultAssets() String8 path(root); path.appendPath(kSystemAssets); - return addAssetPath(path, NULL); + String8 pathCM(root); + pathCM.appendPath(kCMSDKAssets); + + return addAssetPath(path, NULL) & addAssetPath(pathCM, NULL); } int32_t AssetManager::nextAssetPath(const int32_t cookie) const diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp index 62aabb1..320486d 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp @@ -60,6 +60,7 @@ namespace android { #define IDMAP_CURRENT_VERSION 0x00000001 #define APP_PACKAGE_ID 0x7f +#define CMSDK_PACKAGE_ID 0x3f #define SYS_PACKAGE_ID 0x01 static const bool kDebugStringPoolNoisy = false; @@ -6232,6 +6233,7 @@ DynamicRefTable::DynamicRefTable(uint8_t packageId) // Reserved package ids mLookupTable[APP_PACKAGE_ID] = APP_PACKAGE_ID; mLookupTable[SYS_PACKAGE_ID] = SYS_PACKAGE_ID; + mLookupTable[CMSDK_PACKAGE_ID] = CMSDK_PACKAGE_ID; } status_t DynamicRefTable::load(const ResTable_lib_header* const header) @@ -6539,7 +6541,6 @@ bool ResTable::getIdmapInfo(const void* idmap, size_t sizeBytes, return true; } - #define CHAR16_TO_CSTR(c16, len) (String8(String16(c16,len)).string()) #define CHAR16_ARRAY_EQ(constant, var, len) \ |