diff options
| author | Jakub Adamek <jakuba@google.com> | 2016-09-23 09:07:11 +0100 |
|---|---|---|
| committer | Jakub Adamek <jakuba@google.com> | 2016-09-28 10:09:20 +0100 |
| commit | 1c15c635785c64aee961f895dabd184cc2e9e0b1 (patch) | |
| tree | bf3ac913df3dda46004dd124ce976887b2e7aadb /libs/androidfw/AssetManager.cpp | |
| parent | 6d2c9c29dc2bcfbfdaf272cc3082fc7ae6fcda30 (diff) | |
Search for runtime resource overlays in subdir.
See go/sku-colors. This changes the directory to search for framework
overlays if the right system property is defined. This allows
OEMs to specify different resources based on device SKUs.
Bug: 31692079
Change-Id: I9cb121b286b7f52aa26de1757fde1f3110cd47fd
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 { |