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

Commit a300d5fd authored by Pechetty Sravani (xWF)'s avatar Pechetty Sravani (xWF)
Browse files

Revert "Use a single library for interacting with vdm flags" 

Revert submission 28322992-vdm leaksanitizer crash

Reason for revert: Droidmonitor created revert due to b/354084220. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:28322992-vdm+leaksanitizer+crash

Change-Id: I0bc05bc8022e6c33e6ea0dd8782f2fc19ca4bbfd
parent 32993d57

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",

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

        "libbase",

        "libbinder",

        "libbinder_ndk",

services/inputflinger/reader/Android.bp

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

    srcs: [":libinputreader_sources"],

    shared_libs: [

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

        "libbase",

        "libcap",

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

    ],

    shared_libs: [

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

        "libinputflinger_base",

    ],

    export_header_lib_headers: [
@@ -141,6 +141,7 @@ 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

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

    },

    static_libs: [

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

        "libflagtest",

        "libgmock",

    ],