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

Commit 037f35ae authored by Jiwen 'Steve' Cai's avatar Jiwen 'Steve' Cai
Browse files

Build libbufferhubqueue and libpdx_default_transport as shared library 

Now that we are moving BufferHub into libgui, these two libraries are
being linked into libgui.so and libdvr.so respectively as static
lib. This is cauing issues when a binary/app depends on both, i.e. two
copies of the static lib will live in the same binary. We can avoid this
issue by building these two as shared library.

Test: Build system
Bug: 72763929
Change-Id: I26ba18f2b84d43cbd62b26dbb9ee0574c2974f7d
parent 0d3890a9

cmds/atrace/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ cc_binary { 
        "libcutils",

        "libz",

        "libbase",

    ],

    static_libs: [

        "libpdx_default_transport",

    ],

libs/gui/Android.bp

+2 −7
Original line number Diff line number Diff line
@@ -120,6 +120,8 @@ cc_library_shared { 
    shared_libs: [

        "libsync",

        "libbinder",

        "libbufferhubqueue",  // TODO(b/70046255): Remove this once BufferHub is integrated into libgui.

        "libpdx_default_transport",

        "libcutils",

        "libEGL",

        "libGLESv2",
@@ -135,13 +137,6 @@ cc_library_shared { 
        "android.hardware.configstore-utils",

    ],



    // TODO(b/70046255): Remove these once BufferHub is integrated into libgui.

    static_libs: [

        "libbufferhub",

        "libbufferhubqueue",

        "libpdx_default_transport",

    ],



    header_libs: [

        "libdvr_headers",

        "libnativebase_headers",

libs/vr/libbufferhub/Android.bp

+3 −7
Original line number Diff line number Diff line
@@ -22,10 +22,6 @@ localIncludeFiles = [ 
    "include",

]



staticLibraries = [

    "libpdx_default_transport",

]



sharedLibraries = [

    "libbase",

    "libbinder",
@@ -34,7 +30,8 @@ sharedLibraries = [ 
    "liblog",

    "libui",

    "libutils",

    "libnativewindow"

    "libnativewindow",

    "libpdx_default_transport",

]



headerLibraries = [
@@ -52,7 +49,6 @@ cc_library { 
        "-Werror",

    ],

    export_include_dirs: localIncludeFiles,

    static_libs: staticLibraries,

    shared_libs: sharedLibraries,

    header_libs: headerLibraries,

    name: "libbufferhub",
@@ -68,7 +64,7 @@ cc_library { 
cc_test {

    tags: ["optional"],

    srcs: ["buffer_hub-test.cpp"],

    static_libs: ["libbufferhub"] + staticLibraries,

    static_libs: ["libbufferhub"],

    shared_libs: sharedLibraries,

    header_libs: headerLibraries,

    name: "buffer_hub-test",

libs/vr/libbufferhubqueue/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ includeFiles = [ 


staticLibraries = [

    "libbufferhub",

    "libpdx_default_transport",

]



sharedLibraries = [
@@ -34,6 +33,7 @@ sharedLibraries = [ 
    "liblog",

    "libui",

    "libutils",

    "libpdx_default_transport",

]



headerLibraries = [
@@ -41,7 +41,7 @@ headerLibraries = [ 
    "libnativebase_headers",

]



cc_library {

cc_library_shared {

    name: "libbufferhubqueue",

    cflags: [

        "-DLOG_TAG=\"libbufferhubqueue\"",

libs/vr/libbufferhubqueue/tests/Android.bp

+2 −3
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ header_libraries = [ 
shared_libraries = [

    "libbase",

    "libbinder",

    "libbufferhubqueue",

    "libcutils",

    "libgui",

    "liblog",
@@ -13,14 +14,12 @@ shared_libraries = [ 
    "libui",

    "libutils",

    "libnativewindow",

    "libpdx_default_transport",

]



static_libraries = [

    "libbufferhubqueue",

    "libbufferhub",

    "libchrome",

    "libdvrcommon",

    "libpdx_default_transport",

    "libperformance",

]