commit f0c62b26765f1e0ec0df8fceeecb77fca690c29a
author Tim Murray <timmurray@google.com> Fri May 16 11:47:26 2014 -0700
committer Tim Murray <timmurray@google.com> Tue Jun 03 12:30:53 2014 -0700
tree f79737d93c08e6cb882cdc241da57926add84d90
parent b75b3aaac4f0282a99bb4486b5dce51a87bc0dd7

Add support for mixed 32/64 APKs using RenderScript.

Change-Id: I8901a1547d180c9dcef320f86d07a5b82551fb5c

rs/java/android/renderscript/RenderScript.java

diff --git a/rs/java/android/renderscript/RenderScript.java b/rs/java/android/renderscript/RenderScript.java
index ea25f58..bbe5c49 100644
--- a/rs/java/android/renderscript/RenderScript.java
+++ b/rs/java/android/renderscript/RenderScript.java
@@ -67,6 +67,12 @@
     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 @@
                 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);