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/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",