summaryrefslogtreecommitdiffstats
path: root/media/jni
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2015-04-13 15:20:29 -0700
committerJohn Reck <jreck@google.com>2015-04-14 15:38:22 -0700
commitc294d128d03bc9a9982b273a82516c04583438cc (patch)
treefd6c7ae3a6a292caf48160f0c0c8cc82e4729225 /media/jni
parent4fc266bbef6129b5cefc910f0680eb9d61794faf (diff)
downloadframeworks_base-c294d128d03bc9a9982b273a82516c04583438cc.zip
frameworks_base-c294d128d03bc9a9982b273a82516c04583438cc.tar.gz
frameworks_base-c294d128d03bc9a9982b273a82516c04583438cc.tar.bz2
A bunch more cleanups
Switch a few places to using android::canvas instead of SkCanvas as well which eliminated some JNI Change-Id: I8f98b56442a06362b82b984cd1bd3a92398d8dbc
Diffstat (limited to 'media/jni')
-rw-r--r--media/jni/Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/jni/Android.mk b/media/jni/Android.mk
index 5b177e5..66d055a 100644
--- a/media/jni/Android.mk
+++ b/media/jni/Android.mk
@@ -42,7 +42,7 @@ LOCAL_SHARED_LIBRARIES := \
libusbhost \
libjhead \
libexif \
- libstagefright_amrnb_common \
+ libstagefright_amrnb_common
LOCAL_REQUIRED_MODULES := \
libjhead_jni
@@ -54,6 +54,7 @@ LOCAL_C_INCLUDES += \
external/libexif/ \
external/tremor/Tremor \
frameworks/base/core/jni \
+ frameworks/base/libs/hwui \
frameworks/av/media/libmedia \
frameworks/av/media/libstagefright \
frameworks/av/media/libstagefright/codecs/amrnb/enc/src \