summaryrefslogtreecommitdiff
path: root/rs/jni
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2017-07-24 09:42:07 -0400
committerDerek Sollenberger <djsollen@google.com>2017-07-24 09:42:07 -0400
commitd938e5a2e2d89dda6a3562c530d28a353e8198ce (patch)
tree2f61709ea8928c625219e3d3d124fbe319706921 /rs/jni
parent9c308e6a369fcf760cc0944c713e11903ebbef91 (diff)
Reduce overhead by combining libskia and libhwui into a single library.
This is a multiproject change as we need to both the libraries themselves as well as those that had dependencies on libskia.so Bug: 31971097 Test: compile only Change-Id: Ie6ff1f4682d03289205f4d6048cde9f95c61a90f
Diffstat (limited to 'rs/jni')
-rw-r--r--rs/jni/Android.mk6
1 files changed, 2 insertions, 4 deletions
diff --git a/rs/jni/Android.mk b/rs/jni/Android.mk
index 21438e04f38c..0854b9582187 100644
--- a/rs/jni/Android.mk
+++ b/rs/jni/Android.mk
@@ -12,7 +12,7 @@ LOCAL_SHARED_LIBRARIES := \
libRS \
libcutils \
liblog \
- libskia \
+ libhwui \
libutils \
libui \
libgui \
@@ -23,9 +23,7 @@ LOCAL_HEADER_LIBRARIES := \
LOCAL_C_INCLUDES += \
$(JNI_H_INCLUDE) \
- frameworks/rs \
- frameworks/base/core/jni \
- frameworks/base/libs/hwui
+ frameworks/rs
LOCAL_CFLAGS += -Wno-unused-parameter
LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code