diff --git a/cmds/bootanimation/Android.mk b/cmds/bootanimation/Android.mk
index 73ec63f396b44..559e8de5ae307 100644
--- a/cmds/bootanimation/Android.mk
+++ b/cmds/bootanimation/Android.mk
@@ -77,7 +77,7 @@ LOCAL_SHARED_LIBRARIES := \
     libutils \
     libbinder \
     libui \
-    libskia \
+    libhwui \
     libEGL \
     libGLESv1_CM \
     libgui \
diff --git a/cmds/screencap/Android.mk b/cmds/screencap/Android.mk
index b0dc42250faed..72e3c56bc6e4f 100644
--- a/cmds/screencap/Android.mk
+++ b/cmds/screencap/Android.mk
@@ -8,7 +8,7 @@ LOCAL_SHARED_LIBRARIES := \
     libcutils \
     libutils \
     libbinder \
-    libskia \
+    libhwui \
     libui \
     libgui
 
diff --git a/core/jni/Android.bp b/core/jni/Android.bp
index d63e22c189f89..016c0c8e37df7 100644
--- a/core/jni/Android.bp
+++ b/core/jni/Android.bp
@@ -239,7 +239,6 @@ cc_library_shared {
         "libinput",
         "libcamera_client",
         "libcamera_metadata",
-        "libskia",
         "libsqlite",
         "libEGL",
         "libGLESv1_CM",
diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp
index 770a57a5c4452..124182f0336e7 100644
--- a/libs/hwui/Android.bp
+++ b/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",
diff --git a/libs/input/Android.bp b/libs/input/Android.bp
index 43107064332e3..67682a06cb6ab 100644
--- a/libs/input/Android.bp
+++ b/libs/input/Android.bp
@@ -24,7 +24,7 @@ cc_library_shared {
         "libcutils",
         "liblog",
         "libutils",
-        "libskia",
+        "libhwui",
         "libgui",
         "libui",
         "libinput",
diff --git a/media/jni/Android.bp b/media/jni/Android.bp
index 02667ca070a43..1d85c97239ac6 100644
--- a/media/jni/Android.bp
+++ b/media/jni/Android.bp
@@ -38,7 +38,7 @@ cc_library_shared {
         "libmediametrics",
         "libmediadrm",
         "libmidi",
-        "libskia",
+        "libhwui",
         "libui",
         "liblog",
         "libcutils",
diff --git a/native/graphics/jni/Android.mk b/native/graphics/jni/Android.mk
index ec4b35aac9c38..7a40e62d45277 100644
--- a/native/graphics/jni/Android.mk
+++ b/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
 
diff --git a/rs/jni/Android.mk b/rs/jni/Android.mk
index 21438e04f38cc..0854b95821870 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
diff --git a/services/core/jni/Android.mk b/services/core/jni/Android.mk
index bf9f941ad9a36..9655637933ad3 100644
--- a/services/core/jni/Android.mk
+++ b/services/core/jni/Android.mk
@@ -78,7 +78,6 @@ LOCAL_SHARED_LIBRARIES += \
     libschedulerservicehidl \
     libsensorservice \
     libsensorservicehidl \
-    libskia \
     libgui \
     libusbhost \
     libsuspend \