commit 32993d5711d0b2ffbe4d4322fac95036b9ffc784
author Siarhei Vishniakou <svv@google.com> Mon Jul 15 11:15:18 2024 -0700
committer Siarhei Vishniakou <svv@google.com> Thu Jul 18 17:57:09 2024 -0700
tree d4ce7aea91579f3b9f4fc1d2671fe9372250641d
parent 034fbb1e8f82adf25090eb77fc85fe6887f46e36

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

services/inputflinger/reader/Android.bp

diff --git a/services/inputflinger/reader/Android.bp b/services/inputflinger/reader/Android.bp
index a052a4e..b76e8c5 100644
--- a/services/inputflinger/reader/Android.bp
+++ b/services/inputflinger/reader/Android.bp
@@ -78,6 +78,7 @@
     name: "libinputreader_defaults",
     srcs: [":libinputreader_sources"],
     shared_libs: [
+        "android.companion.virtualdevice.flags-aconfig-cc",
         "libbase",
         "libcap",
         "libcrypto",
@@ -115,7 +116,6 @@
         "libinputreader_defaults",
     ],
     shared_libs: [
-        "android.companion.virtualdevice.flags-aconfig-cc-host",
         "libinputflinger_base",
     ],
     export_header_lib_headers: [
@@ -141,7 +141,6 @@
     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",
     ],