diff options
| author | Jakub Adamek <jakuba@google.com> | 2016-10-03 10:38:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-03 10:38:13 +0000 |
| commit | 1c527915f7c6389c8d3bfa3bf70bde50c64599b9 (patch) | |
| tree | 1293b2844ee4b85e43bd1ad52b245cfb2e31c060 /libs/androidfw/AssetManager.cpp | |
| parent | c50495c4bbb2f15f0ddc1dfcd2df3b11a9cb3a1d (diff) | |
| parent | e60842aba30adee4cf2057a39ac9a396790e938f (diff) | |
Change name of overlay subdir property to sku. am: c03d9483f0
am: e60842aba3
Change-Id: Ifda5c5a7fc7eaff49aa2f65671d543e285b7f8a4
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 fe78cefd380a..171532bfa98e 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 { |