diff options
author | Jakub Adamek <jakuba@google.com> | 2016-10-03 10:30:14 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-10-03 10:30:14 +0000 |
commit | e60842aba30adee4cf2057a39ac9a396790e938f (patch) | |
tree | 179f61a2d86eb624641387ee115f6e3718dbc60f /libs/androidfw/AssetManager.cpp | |
parent | d9c364a65411b008340655012efc00d4d07cbd73 (diff) | |
parent | c03d9483f0380fb7babfdeb11d6762bc6c8d784c (diff) |
Change name of overlay subdir property to sku.
am: c03d9483f0
Change-Id: I1368890b9c2dde2c5177473da3af0872c0c937a1
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 { |