summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-06-05 23:52:48 +0100
committerSteve Kondik <shade@chemlab.org>2013-07-24 12:59:41 -0700
commit01ad455c149af55d34762c11ada603f61515d6bf (patch)
treeb355b8df0ece7d844f0ed77df1aa53b2ff2c971d
parenta4c574321cfe9d874e69d365b1326ccc27f4e9dd (diff)
downloadandroid_dalvik-01ad455c149af55d34762c11ada603f61515d6bf.tar.gz
android_dalvik-01ad455c149af55d34762c11ada603f61515d6bf.tar.bz2
android_dalvik-01ad455c149af55d34762c11ada603f61515d6bf.zip
dvm: Bring back the ANDROID_DATA override
This got broken by the split-cache patch, and it's impacting the CTS vm unit. Fixit. Change-Id: I602824afef19c92a4d2c1702d10c8f0315277227
-rw-r--r--libdex/OptInvocation.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libdex/OptInvocation.cpp b/libdex/OptInvocation.cpp
index 7a25c2954..5014f4795 100644
--- a/libdex/OptInvocation.cpp
+++ b/libdex/OptInvocation.cpp
@@ -116,7 +116,7 @@ char* dexOptGenerateCacheFileName(const char* fileName, const char* subFileName)
systemRoot = "/system";
if (dexRoot == NULL)
- dexRoot = "/data";
+ dexRoot = dataRoot;
/* Cache anything stored on /system in cacheRoot, everything else in dataRoot */
if (!strncmp(absoluteFile, systemRoot, strlen(systemRoot))) {