diff options
author | Tim Murray <timmurray@google.com> | 2014-05-16 11:47:26 -0700 |
---|---|---|
committer | Tim Murray <timmurray@google.com> | 2014-06-03 12:30:53 -0700 |
commit | f0c62b26765f1e0ec0df8fceeecb77fca690c29a (patch) | |
tree | f79737d93c08e6cb882cdc241da57926add84d90 /rs/java/android/renderscript/RenderScript.java | |
parent | b75b3aaac4f0282a99bb4486b5dce51a87bc0dd7 (diff) |
Add support for mixed 32/64 APKs using RenderScript.
Change-Id: I8901a1547d180c9dcef320f86d07a5b82551fb5c
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
-rw-r--r-- | rs/java/android/renderscript/RenderScript.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/rs/java/android/renderscript/RenderScript.java b/rs/java/android/renderscript/RenderScript.java index ea25f5896e00..bbe5c4976adf 100644 --- a/rs/java/android/renderscript/RenderScript.java +++ b/rs/java/android/renderscript/RenderScript.java @@ -67,6 +67,12 @@ public class RenderScript { static Method registerNativeAllocation; static Method registerNativeFree; + /* + * Detect the bitness of the VM to allow FieldPacker to do the right thing. + */ + static native int rsnSystemGetPointerSize(); + static int sPointerSize; + static { sInitialized = false; if (!SystemProperties.getBoolean("config.disable_renderscript", false)) { @@ -84,6 +90,7 @@ public class RenderScript { System.loadLibrary("rs_jni"); _nInit(); sInitialized = true; + sPointerSize = rsnSystemGetPointerSize(); } catch (UnsatisfiedLinkError e) { Log.e(LOG_TAG, "Error loading RS jni library: " + e); throw new RSRuntimeException("Error loading RS jni library: " + e); |