diff options
| author | John Reck <jreck@google.com> | 2015-03-04 08:36:12 -0800 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2015-03-05 09:55:02 -0800 |
| commit | b2915245b74b3b5541b123e38403f8e26426b4b7 (patch) | |
| tree | 295bee60e89bba1ae2221bf40833a80e6d2c41ef /rs/jni/Android.mk | |
| parent | f855b0d2d0c0c157d657668fcb98097e2aca097e (diff) | |
| download | frameworks_base-b2915245b74b3b5541b123e38403f8e26426b4b7.zip frameworks_base-b2915245b74b3b5541b123e38403f8e26426b4b7.tar.gz frameworks_base-b2915245b74b3b5541b123e38403f8e26426b4b7.tar.bz2 | |
Cleanup Bitmap JNI
Fix a bunch of places where mNativeBitmap was being
poked at directly, switch them either to the NDK API
or to GraphicsJNI where it made sense
Change-Id: I6b3df3712d6497cba828c2d3012e725cb4ebb64d
Diffstat (limited to 'rs/jni/Android.mk')
| -rw-r--r-- | rs/jni/Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/rs/jni/Android.mk b/rs/jni/Android.mk index f1f0bfc..94f0859 100644 --- a/rs/jni/Android.mk +++ b/rs/jni/Android.mk @@ -14,7 +14,8 @@ LOCAL_SHARED_LIBRARIES := \ libskia \ libutils \ libui \ - libgui + libgui \ + libjnigraphics LOCAL_STATIC_LIBRARIES := @@ -23,6 +24,7 @@ rs_generated_include_dir := $(call intermediates-dir-for,SHARED_LIBRARIES,libRS, LOCAL_C_INCLUDES += \ $(JNI_H_INCLUDE) \ frameworks/rs \ + frameworks/base/core/jni \ $(rs_generated_include_dir) LOCAL_CFLAGS += -Wno-unused-parameter -std=c++11 |