summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
authorJakub Adamek <jakuba@google.com>2016-09-28 10:33:16 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-28 10:33:16 +0000
commitbfc891c25c039eb296d4318cc5b9f64b180fcbfa (patch)
tree40d998f3319cdeb8b48c0ad4814a87ad34a4c687 /libs/androidfw/AssetManager.cpp
parent0820881132062078446cec86f3e7efb0e8733dc7 (diff)
parentff5cb9888882f02d92ae4abf5dc03495ea5060b1 (diff)
Search for runtime resource overlays in subdir. am: 1c15c63578
am: ff5cb98888 Change-Id: I726b08026ceb250cc95669d3b5a5c35e15bf82e4
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 641a7ffc2a78..fe78cefd380a 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 {