diff options
| author | Tim Murray <timmurray@google.com> | 2014-06-03 21:36:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-03 21:36:19 +0000 |
| commit | 1afc29ae3895f7362e50f1d7b9f35bb689c96140 (patch) | |
| tree | 518d6ab2a7ad9b6152cc05f8171f34e0e15b60d6 /rs/java/android/renderscript/FieldPacker.java | |
| parent | 7e547e0d72817032737909952f00acc2e777a35a (diff) | |
| parent | f0c62b26765f1e0ec0df8fceeecb77fca690c29a (diff) | |
Merge "Add support for mixed 32/64 APKs using RenderScript."
Diffstat (limited to 'rs/java/android/renderscript/FieldPacker.java')
| -rw-r--r-- | rs/java/android/renderscript/FieldPacker.java | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/rs/java/android/renderscript/FieldPacker.java b/rs/java/android/renderscript/FieldPacker.java index cf20e635e22a..2ff1c28d3f8f 100644 --- a/rs/java/android/renderscript/FieldPacker.java +++ b/rs/java/android/renderscript/FieldPacker.java @@ -232,10 +232,18 @@ public class FieldPacker { public void addObj(BaseObj obj) { if (obj != null) { - // FIXME: this is fine for 32-bit but needs a path for 64-bit - addI32((int)obj.getID(null)); + if (RenderScript.sPointerSize == 8) { + addI64(obj.getID(null)); + } + else { + addI32((int)obj.getID(null)); + } } else { - addI32(0); + if (RenderScript.sPointerSize == 8) { + addI64(0); + } else { + addI32(0); + } } } |