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

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

Fix issue with duplicate symbols in renderengine_test 

The test binary statically links two renderengine targets both of
which included skia as a whole static lib which was causing symbol
collisions when attempting to roll in a new version of Skia.

Test: make
Bug: 179813345
Change-Id: I1208a003d85b4fd3c4d6df7765d0215ab13e584f
parent 019f359d

libs/renderengine/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -31,10 +31,6 @@ cc_defaults { 
        "libui",

        "libutils",

    ],

    include_dirs: [

        "external/skia/src/gpu",

    ],

    whole_static_libs: ["libskia"],

    local_include_dirs: ["include"],

    export_include_dirs: ["include"],

}
@@ -106,6 +102,10 @@ cc_library_static { 
        ":librenderengine_threaded_sources",

        ":librenderengine_skia_sources",

    ],

    include_dirs: [

        "external/skia/src/gpu",

    ],

    whole_static_libs: ["libskia"],

    lto: {

        thin: true,

    },