diff options
| author | Jakub Adamek <jakuba@google.com> | 2016-09-30 09:19:09 +0100 |
|---|---|---|
| committer | Jakub Adamek <jakuba@google.com> | 2016-10-03 10:14:12 +0100 |
| commit | c03d9483f0380fb7babfdeb11d6762bc6c8d784c (patch) | |
| tree | 1586b9da530a3ae49bfd79e9745f9a1c9b19b483 /libs/androidfw/AssetManager.cpp | |
| parent | c350547dcffec2ca490f881019c08cd4339251dc (diff) | |
Change name of overlay subdir property to sku.
Also move the SKU subdirectories directly under /vendor/overlay.
Bug: 31692079
Change-Id: I68c712b13918cc99629534580ee4f77d9e5b3823
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
| -rw-r--r-- | libs/androidfw/AssetManager.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp index 6fb57fafe5c0..daf35921b13d 100644 --- a/libs/androidfw/AssetManager.cpp +++ b/libs/androidfw/AssetManager.cpp @@ -76,10 +76,9 @@ static volatile int32_t gCount = 0; const char* AssetManager::RESOURCES_FILENAME = "resources.arsc"; const char* AssetManager::IDMAP_BIN = "/system/bin/idmap"; const char* AssetManager::OVERLAY_DIR = "/vendor/overlay"; +const char* AssetManager::OVERLAY_SKU_DIR_PROPERTY = "ro.boot.vendor.overlay.sku"; 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 { |