Merge "Reduce overhead by combining libskia and libhwui into a single library."

cmds/bootanimation/Android.mk

@@ -77,7 +77,7 @@ LOCAL_SHARED_LIBRARIES := \
     libutils \
     libbinder \
     libui \
-    libskia \
+    libhwui \
     libEGL \
     libGLESv1_CM \
     libgui \

cmds/screencap/Android.mk

@@ -8,7 +8,7 @@ LOCAL_SHARED_LIBRARIES := \
     libcutils \
     libutils \
     libbinder \
-    libskia \
+    libhwui \
     libui \
     libgui
 

core/jni/Android.bp

@@ -239,7 +239,6 @@ cc_library_shared {
         "libinput",
         "libcamera_client",
         "libcamera_metadata",
-        "libskia",
         "libsqlite",
         "libEGL",
         "libGLESv1_CM",

libs/hwui/Android.bp

@@ -2,7 +2,7 @@ cc_defaults {
     name: "hwui_defaults",
     defaults: [
         "hwui_static_deps",
-
+        "skia_deps"
         //"hwui_bugreport_font_cache_usage",
         //"hwui_compile_for_perf",
     ],
@@ -55,7 +55,6 @@ cc_defaults {
         "libEGL",
         "libGLESv2",
         "libvulkan",
-        "libskia",
         "libui",
         "libgui",
         "libprotobuf-cpp-lite",
@@ -114,6 +113,9 @@ cc_defaults {
 cc_defaults {
     name: "libhwui_defaults",
     defaults: ["hwui_defaults"],
+
+    whole_static_libs: ["libskia"],
+
     srcs: [
         "hwui/Bitmap.cpp",
         "font/CacheTexture.cpp",

libs/input/Android.bp

@@ -24,7 +24,7 @@ cc_library_shared {
         "libcutils",
         "liblog",
         "libutils",
-        "libskia",
+        "libhwui",
         "libgui",
         "libui",
         "libinput",

media/jni/Android.bp

@@ -38,7 +38,7 @@ cc_library_shared {
         "libmediametrics",
         "libmediadrm",
         "libmidi",
-        "libskia",
+        "libhwui",
         "libui",
         "liblog",
         "libcutils",

native/graphics/jni/Android.mk

@@ -20,14 +20,11 @@ LOCAL_SRC_FILES:= \
 
 LOCAL_SHARED_LIBRARIES := \
     libandroid_runtime \
-    libskia \
     libui \
     libandroidfw
 
 LOCAL_C_INCLUDES += \
-    frameworks/base/native/include \
-    frameworks/base/core/jni/android/graphics \
-    frameworks/base/libs/hwui
+    frameworks/base/core/jni/android/graphics
 
 LOCAL_MODULE:= libjnigraphics
 

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

services/core/jni/Android.mk

@@ -78,7 +78,6 @@ LOCAL_SHARED_LIBRARIES += \
     libschedulerservicehidl \
     libsensorservice \
     libsensorservicehidl \
-    libskia \
     libgui \
     libusbhost \
     libsuspend \