Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d938e5a2 authored by Derek Sollenberger's avatar Derek Sollenberger
Browse files

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
parent 9c308e6a

cmds/bootanimation/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ LOCAL_SHARED_LIBRARIES := \ 
    libutils \

    libbinder \

    libui \

    libskia \

    libhwui \

    libEGL \

    libGLESv1_CM \

    libgui \

cmds/screencap/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ LOCAL_SHARED_LIBRARIES := \ 
    libcutils \

    libutils \

    libbinder \

    libskia \

    libhwui \

    libui \

    libgui

core/jni/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -238,7 +238,6 @@ cc_library_shared { 
        "libinput",

        "libcamera_client",

        "libcamera_metadata",

        "libskia",

        "libsqlite",

        "libEGL",

        "libGLESv1_CM",

libs/hwui/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ cc_defaults { 
    name: "hwui_defaults",

    defaults: [

        "hwui_static_deps",



        "skia_deps"

        //"hwui_bugreport_font_cache_usage",

        //"hwui_compile_for_perf",

    ],
@@ -54,7 +54,6 @@ cc_defaults { 
        "libEGL",

        "libGLESv2",

        "libvulkan",

        "libskia",

        "libui",

        "libgui",

        "libprotobuf-cpp-lite",
@@ -113,6 +112,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

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ cc_library_shared { 
        "libcutils",

        "liblog",

        "libutils",

        "libskia",

        "libhwui",

        "libgui",

        "libui",

        "libinput",