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

Commit 32993d57 authored by Siarhei Vishniakou's avatar Siarhei Vishniakou
Browse files

Use a single library for interacting with vdm flags 

Before this CL, there were 3 different libraries for interacting with
vdm aconfig flags, which caused memory leaks in some circumstances.

To simplify the code and avoid confusion, switch to using a single
library instead. Unfortunately, that also means that we need to put that
library into test mode, but currently there isn't a better alternative
available for tests.

Bug: 352596575
Flag: EXEMPT bugfix
Test: m checkinput
Change-Id: Iece976186f1408b8cd5dbaccf4e82dfcb0417ebe
parent 034fbb1e

libs/input/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ cc_library { 
    ],



    shared_libs: [

        "android.companion.virtualdevice.flags-aconfig-cc-host",

        "android.companion.virtualdevice.flags-aconfig-cc",

        "libbase",

        "libbinder",

        "libbinder_ndk",

services/inputflinger/reader/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ cc_defaults { 
    name: "libinputreader_defaults",

    srcs: [":libinputreader_sources"],

    shared_libs: [

        "android.companion.virtualdevice.flags-aconfig-cc",

        "libbase",

        "libcap",

        "libcrypto",
@@ -115,7 +116,6 @@ cc_library_static { 
        "libinputreader_defaults",

    ],

    shared_libs: [

        "android.companion.virtualdevice.flags-aconfig-cc-host",

        "libinputflinger_base",

    ],

    export_header_lib_headers: [
@@ -141,7 +141,6 @@ cc_library_shared { 
    shared_libs: [

        // This should consist only of dependencies from inputflinger. Other dependencies should be

        // in cc_defaults so that they are included in the tests.

        "android.companion.virtualdevice.flags-aconfig-cc-host",

        "libinputflinger_base",

        "libjsoncpp",

    ],

services/inputflinger/tests/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -111,7 +111,6 @@ cc_test { 
        },

    },

    static_libs: [

        "android.companion.virtualdevice.flags-aconfig-cc-test",

        "libflagtest",

        "libgmock",

    ],