diff options
Diffstat (limited to 'rs')
| -rw-r--r-- | rs/java/android/renderscript/ScriptIntrinsicLUT.java | 4 | ||||
| -rw-r--r-- | rs/jni/Android.mk | 3 | ||||
| -rw-r--r-- | rs/jni/android_renderscript_RenderScript.cpp | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/rs/java/android/renderscript/ScriptIntrinsicLUT.java b/rs/java/android/renderscript/ScriptIntrinsicLUT.java index 69ff64acdf90..e90462d11124 100644 --- a/rs/java/android/renderscript/ScriptIntrinsicLUT.java +++ b/rs/java/android/renderscript/ScriptIntrinsicLUT.java @@ -56,6 +56,10 @@ public final class ScriptIntrinsicLUT extends ScriptIntrinsic { } + public void destroy() { + mTables.destroy(); + super.destroy(); + } private void validate(int index, int value) { if (index < 0 || index > 255) { diff --git a/rs/jni/Android.mk b/rs/jni/Android.mk index 4040db36c4fb..21438e04f38c 100644 --- a/rs/jni/Android.mk +++ b/rs/jni/Android.mk @@ -18,7 +18,8 @@ LOCAL_SHARED_LIBRARIES := \ libgui \ libjnigraphics -LOCAL_STATIC_LIBRARIES := +LOCAL_HEADER_LIBRARIES := \ + libbase_headers LOCAL_C_INCLUDES += \ $(JNI_H_INCLUDE) \ diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp index 0acbb0258944..c059973ed437 100644 --- a/rs/jni/android_renderscript_RenderScript.cpp +++ b/rs/jni/android_renderscript_RenderScript.cpp @@ -27,6 +27,7 @@ #include <androidfw/Asset.h> #include <androidfw/AssetManager.h> #include <androidfw/ResourceTypes.h> +#include <android-base/macros.h> #include "jni.h" #include "JNIHelp.h" |