From 7d25a829d3da96fb6ac0d285aa1bfb2022271bee Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Tue, 9 Apr 2013 23:51:56 -0700 Subject: Defer RS cache creation until a ScriptC is built. Bug: 8582926 Change-Id: If017f41382f023f8f6ddd78ba198402d427c95f8 --- graphics/java/android/renderscript/RenderScript.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'graphics/java/android/renderscript/RenderScript.java') diff --git a/graphics/java/android/renderscript/RenderScript.java b/graphics/java/android/renderscript/RenderScript.java index 2438532c98dd..d5af2767bb40 100644 --- a/graphics/java/android/renderscript/RenderScript.java +++ b/graphics/java/android/renderscript/RenderScript.java @@ -83,11 +83,7 @@ public class RenderScript { native void nContextInitToClient(int con); native void nContextDeinitToClient(int con); - /** - * Name of the file that holds the object cache. - */ - private static final String CACHE_PATH = "com.android.renderscript.cache"; - static String mCachePath; + static File mCacheDir; /** * Sets the directory to use as a persistent storage for the @@ -97,9 +93,8 @@ public class RenderScript { * @param cacheDir A directory the current process can write to */ public static void setupDiskCache(File cacheDir) { - File f = new File(cacheDir, CACHE_PATH); - mCachePath = f.getAbsolutePath(); - f.mkdirs(); + // Defer creation of cache path to nScriptCCreate(). + mCacheDir = cacheDir; } public enum ContextType { -- cgit v1.2.3