From d938e5a2e2d89dda6a3562c530d28a353e8198ce Mon Sep 17 00:00:00 2001
From: Derek Sollenberger <djsollen@google.com>
Date: Mon, 24 Jul 2017 09:42:07 -0400
Subject: 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 | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'rs')

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
-- 
cgit v1.2.3