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

Commit ff3e52c1 authored Jun 22, 2023 by Prabir Pradhan Committed by Android (Google) Code Review Jun 22, 2023

Merge "Link libinput as a shared library for host"

parents a68ffa53 89f71198

libs/input/Android.bp

+0 −3

Original line number	Diff line number	Diff line
		@@ -274,9 +274,6 @@ cc_library {
		],
		},
		host: {
		shared: {
		enabled: false,
		},
		include_dirs: [
		"bionic/libc/kernel/android/uapi/",
		"bionic/libc/kernel/uapi",

services/inputflinger/Android.bp

+2 −8

Original line number	Diff line number	Diff line
		@@ -79,6 +79,7 @@ cc_defaults {
		"libcrypto",
		"libcutils",
		"libhidlbase",
		"libinput",
		"libkll",
		"liblog",
		"libprotobuf-cpp-lite",
		@@ -95,14 +96,12 @@ cc_defaults {
		android: {
		shared_libs: [
		"libgui",
		"libinput",
		"libstatspull",
		"libstatssocket",
		],
		},
		host: {
		static_libs: [
		"libinput",
		"libstatspull",
		"libstatssocket",
		],
		@@ -179,6 +178,7 @@ cc_defaults {
		"libbase",
		"libbinder",
		"libcutils",
		"libinput",
		"liblog",
		"libutils",
		],
		@@ -186,14 +186,8 @@ cc_defaults {
		"libinputflinger_headers",
		],
		target: {
		android: {
		shared_libs: [
		"libinput",
		],
		},
		host: {
		static_libs: [
		"libinput",
		"libui-types",
		],
		},

services/inputflinger/dispatcher/Android.bp

+1 −2

Original line number	Diff line number	Diff line
		@@ -59,6 +59,7 @@ cc_defaults {
		"libbase",
		"libcrypto",
		"libcutils",
		"libinput",
		"libkll",
		"liblog",
		"libprotobuf-cpp-lite",
		@@ -74,14 +75,12 @@ cc_defaults {
		android: {
		shared_libs: [
		"libgui",
		"libinput",
		"libstatspull",
		"libstatssocket",
		],
		},
		host: {
		static_libs: [
		"libinput",
		"libstatspull",
		"libstatssocket",
		],

services/inputflinger/reader/Android.bp

+1 −2

Original line number	Diff line number	Diff line
		@@ -80,6 +80,7 @@ cc_defaults {
		"libcrypto",
		"libcutils",
		"libjsoncpp",
		"libinput",
		"liblog",
		"libPlatformProperties",
		"libstatslog",
		@@ -98,13 +99,11 @@ cc_defaults {
		target: {
		android: {
		shared_libs: [
		"libinput",
		"libstatspull",
		],
		},
		host: {
		static_libs: [
		"libinput",
		"libbinder",
		"libstatspull",
		],

services/inputflinger/tests/Android.bp

+0 −4

Original line number	Diff line number	Diff line
		@@ -75,7 +75,6 @@ cc_test {
		target: {
		android: {
		shared_libs: [
		"libinput",
		"libvintf",
		],
		},
		@@ -90,9 +89,6 @@ cc_test {
		cflags: [
		"-D__ANDROID_HOST__",
		],
		static_libs: [
		"libinput",
		],
		},
		},
		sanitize: {