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
diff --git a/libs/input/Android.bp b/libs/input/Android.bp
index 8fbf5c6..45ebc66 100644
--- a/libs/input/Android.bp
+++ b/libs/input/Android.bp
@@ -258,7 +258,7 @@
],
shared_libs: [
- "android.companion.virtualdevice.flags-aconfig-cc",
+ "android.companion.virtualdevice.flags-aconfig-cc-host",
"libbase",
"libbinder",
"libbinder_ndk",
diff --git a/services/inputflinger/reader/Android.bp b/services/inputflinger/reader/Android.bp
index b76e8c5..a052a4e 100644
--- a/services/inputflinger/reader/Android.bp
+++ b/services/inputflinger/reader/Android.bp
@@ -78,7 +78,6 @@
name: "libinputreader_defaults",
srcs: [":libinputreader_sources"],
shared_libs: [
- "android.companion.virtualdevice.flags-aconfig-cc",
"libbase",
"libcap",
"libcrypto",
@@ -116,6 +115,7 @@
"libinputreader_defaults",
],
shared_libs: [
+ "android.companion.virtualdevice.flags-aconfig-cc-host",
"libinputflinger_base",
],
export_header_lib_headers: [
@@ -141,6 +141,7 @@
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",
],
diff --git a/services/inputflinger/tests/Android.bp b/services/inputflinger/tests/Android.bp
index ab50646..fc05b3c 100644
--- a/services/inputflinger/tests/Android.bp
+++ b/services/inputflinger/tests/Android.bp
@@ -111,6 +111,7 @@
},
},
static_libs: [
+ "android.companion.virtualdevice.flags-aconfig-cc-test",
"libflagtest",
"libgmock",
],