diff options
| author | 2016-09-28 10:19:24 +0000 | |
|---|---|---|
| committer | 2016-09-28 10:19:26 +0000 | |
| commit | 8bb793394d37795d918274c2ed689b663caeeddd (patch) | |
| tree | bed85d0267ddaff8c68cc03184b6d3c3b39dd77b /libs/androidfw/AssetManager.cpp | |
| parent | 1bb6822cd060137a0fe26b2a3d140fa855ab7af0 (diff) | |
| parent | 1c15c635785c64aee961f895dabd184cc2e9e0b1 (diff) | |
Merge "Search for runtime resource overlays in subdir." into cw-f-dev
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
| -rw-r--r-- | libs/androidfw/AssetManager.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp index f50cff4387d2..6fb57fafe5c0 100644 --- a/libs/androidfw/AssetManager.cpp +++ b/libs/androidfw/AssetManager.cpp @@ -78,6 +78,8 @@ const char* AssetManager::IDMAP_BIN = "/system/bin/idmap"; const char* AssetManager::OVERLAY_DIR = "/vendor/overlay"; const char* AssetManager::TARGET_PACKAGE_NAME = "android"; const char* AssetManager::TARGET_APK_PATH = "/system/framework/framework-res.apk"; +const char* AssetManager::OVERLAY_SUBDIR = "/system/vendor/overlay-subdir"; +const char* AssetManager::OVERLAY_SUBDIR_PROPERTY = "ro.boot.vendor.overlay.subdir"; const char* AssetManager::IDMAP_DIR = "/data/resource-cache"; namespace { |