summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
authorJakub Adamek <jakuba@google.com>2016-09-28 10:27:41 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-28 10:27:41 +0000
commitff5cb9888882f02d92ae4abf5dc03495ea5060b1 (patch)
treee0685fe7e89d130266eee0f054cf9e6522a084de /libs/androidfw/AssetManager.cpp
parent5d09ab4812323ab4eabaa9928678d0746ae8a03b (diff)
parent1c15c635785c64aee961f895dabd184cc2e9e0b1 (diff)
Search for runtime resource overlays in subdir.
am: 1c15c63578 Change-Id: Ie6614c07851a2365b623a455b2ccc85672d4c846
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
-rw-r--r--libs/androidfw/AssetManager.cpp2
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 {