Move cache dir to its own class.

This prevents us from loading the RS static initializer all the time.

Change-Id: I8cea7540e50251aba8c2f199f06f344f991e7d7f
This commit is contained in:
Tim Murray
2015-04-07 13:24:14 -07:00
parent d95e58cb60
commit e1e6c66198
4 changed files with 54 additions and 34 deletions

View File

@ -16,7 +16,6 @@
package android.renderscript;
import java.io.File;
import java.lang.reflect.Method;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@ -130,8 +129,6 @@ public class RenderScript {
native void nContextInitToClient(long con);
native void nContextDeinitToClient(long con);
static File mCacheDir;
// this should be a monotonically increasing ID
// used in conjunction with the API version of a device
static final long sMinorID = 1;
@ -146,23 +143,6 @@ public class RenderScript {
return sMinorID;
}
/**
* Sets the directory to use as a persistent storage for the
* renderscript object file cache.
*
* @hide
* @param cacheDir A directory the current process can write to
*/
public static void setupDiskCache(File cacheDir) {
if (!sInitialized) {
Log.e(LOG_TAG, "RenderScript.setupDiskCache() called when disabled");
return;
}
// Defer creation of cache path to nScriptCCreate().
mCacheDir = cacheDir;
}
/**
* ContextType specifies the specific type of context to be created.
*