commit d938e5a2e2d89dda6a3562c530d28a353e8198ce
author Derek Sollenberger <djsollen@google.com> Mon Jul 24 09:42:07 2017 -0400
committer Derek Sollenberger <djsollen@google.com> Mon Jul 24 09:42:07 2017 -0400
tree 2f61709ea8928c625219e3d3d124fbe319706921
parent 9c308e6a369fcf760cc0944c713e11903ebbef91

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

rs/jni/Android.mk

diff --git a/rs/jni/Android.mk b/rs/jni/Android.mk
index 21438e0..0854b95 100644
--- a/rs/jni/Android.mk
+++ b/rs/jni/Android.mk
@@ -12,7 +12,7 @@
     libRS \
     libcutils \
     liblog \
-    libskia \
+    libhwui \
     libutils \
     libui \
     libgui \
@@ -23,9 +23,7 @@
 
 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