diff options
| author | Chad Jones <chadj@google.com> | 2015-03-05 19:34:26 +0000 |
|---|---|---|
| committer | Chad Jones <chadj@google.com> | 2015-03-05 19:34:26 +0000 |
| commit | c02977e3bbfaaedcb1b1d67e1692becc7dddd59b (patch) | |
| tree | 24564767d59138f5c039efefe4744ee35c23ac7e /rs/jni/Android.mk | |
| parent | b2915245b74b3b5541b123e38403f8e26426b4b7 (diff) | |
| download | frameworks_base-c02977e3bbfaaedcb1b1d67e1692becc7dddd59b.zip frameworks_base-c02977e3bbfaaedcb1b1d67e1692becc7dddd59b.tar.gz frameworks_base-c02977e3bbfaaedcb1b1d67e1692becc7dddd59b.tar.bz2 | |
Revert "Cleanup Bitmap JNI"
This reverts commit b2915245b74b3b5541b123e38403f8e26426b4b7.
Change-Id: Idd7d7f33eec4ea5024c83de6b10d3d1a6ab2b17a
Diffstat (limited to 'rs/jni/Android.mk')
| -rw-r--r-- | rs/jni/Android.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/rs/jni/Android.mk b/rs/jni/Android.mk index 94f0859..f1f0bfc 100644 --- a/rs/jni/Android.mk +++ b/rs/jni/Android.mk @@ -14,8 +14,7 @@ LOCAL_SHARED_LIBRARIES := \ libskia \ libutils \ libui \ - libgui \ - libjnigraphics + libgui LOCAL_STATIC_LIBRARIES := @@ -24,7 +23,6 @@ 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 |