commit 3e44e8bffce5ba9ec30c6db30a46cfcd5cbf4ec7
author Siarhei Vishniakou <svv@google.com> Fri Jul 19 14:53:26 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 19 14:54:02 2024 +0000
tree d4ce7aea91579f3b9f4fc1d2671fe9372250641d
parent a300d5fd8a820ebc73ee724f80e241c2d2f7c87f

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

a300d5fd8a820ebc73ee724f80e241c2d2f7c87f

Change-Id: I81bc03cd7ddeb5a01474241ae67257988c977e93

libs/input/Android.bp

diff --git a/libs/input/Android.bp b/libs/input/Android.bp
index 45ebc66..8fbf5c6 100644
--- a/libs/input/Android.bp
+++ b/libs/input/Android.bp
@@ -258,7 +258,7 @@
     ],
 
     shared_libs: [
-        "android.companion.virtualdevice.flags-aconfig-cc-host",
+        "android.companion.virtualdevice.flags-aconfig-cc",
         "libbase",
         "libbinder",
         "libbinder_ndk",

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

services/inputflinger/tests/Android.bp

diff --git a/services/inputflinger/tests/Android.bp b/services/inputflinger/tests/Android.bp
index fc05b3c..ab50646 100644
--- a/services/inputflinger/tests/Android.bp
+++ b/services/inputflinger/tests/Android.bp
@@ -111,7 +111,6 @@
         },
     },
     static_libs: [
-        "android.companion.virtualdevice.flags-aconfig-cc-test",
         "libflagtest",
         "libgmock",
     ],