Merge "Store compiled code in Context.getCodeCacheDir()" automerge: 3fbbe39

automerge: 1641e19

* commit '1641e192a82e266159e0b82078a8f98ebcd3d8ff':
  Store compiled code in Context.getCodeCacheDir()
This commit is contained in:
Pirama Arumuga Nainar
2015-02-11 17:15:47 +00:00
committed by android-build-merger

View File

@@ -4396,10 +4396,16 @@ public final class ActivityThread {
if (cacheDir != null) {
// Provide a usable directory for temporary files
System.setProperty("java.io.tmpdir", cacheDir.getAbsolutePath());
setupGraphicsSupport(data.info, cacheDir);
} else {
Log.e(TAG, "Unable to setupGraphicsSupport due to missing cache directory");
Log.v(TAG, "Unable to initialize \"java.io.tmpdir\" property due to missing cache directory");
}
// Use codeCacheDir to store generated/compiled graphics code
final File codeCacheDir = appContext.getCodeCacheDir();
if (codeCacheDir != null) {
setupGraphicsSupport(data.info, codeCacheDir);
} else {
Log.e(TAG, "Unable to setupGraphicsSupport due to missing code-cache directory");
}
}