summaryrefslogtreecommitdiffstats
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
authorAdnan Begovic <adnan@cyngn.com>2015-07-06 20:06:36 -0700
committerAdnan Begovic <adnan@cyngn.com>2015-10-12 18:07:33 -0700
commit5d0d089a72c57c7c6d81e59bdedf5295df29d13d (patch)
treed960f83f76234e291780dbe38f2b183309062bdb /libs/androidfw/AssetManager.cpp
parent62a8f713e7e1d497fe6f1e46d5d4e38d2a51f9bb (diff)
downloadframeworks_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/AssetManager.cpp')
-rw-r--r--libs/androidfw/AssetManager.cpp6
1 files changed, 5 insertions, 1 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