Merge "Revert^2 "Use a single library for interacting with vdm flags"" into main (e9aa9992) · Commits · e / os / android_frameworks_native

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

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

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