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
diff --git a/cmds/bootanimation/Android.mk b/cmds/bootanimation/Android.mk
index 73ec63f..559e8de 100644
--- a/cmds/bootanimation/Android.mk
+++ b/cmds/bootanimation/Android.mk
@@ -77,7 +77,7 @@
libutils \
libbinder \
libui \
- libskia \
+ libhwui \
libEGL \
libGLESv1_CM \
libgui \
diff --git a/cmds/screencap/Android.mk b/cmds/screencap/Android.mk
index b0dc422..72e3c56 100644
--- a/cmds/screencap/Android.mk
+++ b/cmds/screencap/Android.mk
@@ -8,7 +8,7 @@
libcutils \
libutils \
libbinder \
- libskia \
+ libhwui \
libui \
libgui
diff --git a/core/jni/Android.bp b/core/jni/Android.bp
index c629341..442c689 100644
--- a/core/jni/Android.bp
+++ b/core/jni/Android.bp
@@ -238,7 +238,6 @@
"libinput",
"libcamera_client",
"libcamera_metadata",
- "libskia",
"libsqlite",
"libEGL",
"libGLESv1_CM",
diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp
index 842e053..c05fcc0 100644
--- a/libs/hwui/Android.bp
+++ b/libs/hwui/Android.bp
@@ -2,7 +2,7 @@
name: "hwui_defaults",
defaults: [
"hwui_static_deps",
-
+ "skia_deps"
//"hwui_bugreport_font_cache_usage",
//"hwui_compile_for_perf",
],
@@ -54,7 +54,6 @@
"libEGL",
"libGLESv2",
"libvulkan",
- "libskia",
"libui",
"libgui",
"libprotobuf-cpp-lite",
@@ -113,6 +112,9 @@
cc_defaults {
name: "libhwui_defaults",
defaults: ["hwui_defaults"],
+
+ whole_static_libs: ["libskia"],
+
srcs: [
"hwui/Bitmap.cpp",
"font/CacheTexture.cpp",
diff --git a/libs/input/Android.bp b/libs/input/Android.bp
index 4310706..67682a0 100644
--- a/libs/input/Android.bp
+++ b/libs/input/Android.bp
@@ -24,7 +24,7 @@
"libcutils",
"liblog",
"libutils",
- "libskia",
+ "libhwui",
"libgui",
"libui",
"libinput",
diff --git a/media/jni/Android.bp b/media/jni/Android.bp
index 02667ca..1d85c972 100644
--- a/media/jni/Android.bp
+++ b/media/jni/Android.bp
@@ -38,7 +38,7 @@
"libmediametrics",
"libmediadrm",
"libmidi",
- "libskia",
+ "libhwui",
"libui",
"liblog",
"libcutils",
diff --git a/native/graphics/jni/Android.mk b/native/graphics/jni/Android.mk
index ec4b35a..7a40e62 100644
--- a/native/graphics/jni/Android.mk
+++ b/native/graphics/jni/Android.mk
@@ -20,14 +20,11 @@
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
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
diff --git a/services/core/jni/Android.mk b/services/core/jni/Android.mk
index c8c629f..21944f4 100644
--- a/services/core/jni/Android.mk
+++ b/services/core/jni/Android.mk
@@ -77,7 +77,6 @@
libschedulerservicehidl \
libsensorservice \
libsensorservicehidl \
- libskia \
libgui \
libusbhost \
libsuspend \