Merge "Use cc_defaults in inputflinger targets" (ad19d128) · Commits · e / os / platform_frameworks_native

services/inputflinger/Android.bp

+46 −26

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@
		// See the License for the specific language governing permissions and
		// limitations under the License.

		// Default flags to be used throughout all libraries in inputflinger.
		cc_defaults {
		name: "inputflinger_defaults",
		cflags: [
		@@ -23,22 +24,25 @@ cc_defaults {
		],
		}

		cc_library_shared {
		name: "libinputflinger",
		defaults: ["inputflinger_defaults"],
		/////////////////////////////////////////////////
		// libinputflinger
		/////////////////////////////////////////////////

		filegroup {
		name: "libinputflinger_sources",
		srcs: [
		"InputClassifier.cpp",
		"InputClassifierConverter.cpp",
		"InputManager.cpp",
		],
		}

		cc_defaults {
		name: "libinputflinger_defaults",
		srcs: [":libinputflinger_sources"],
		shared_libs: [
		"android.hardware.input.classifier@1.0",
		"libbase",
		"libinputflinger_base",
		"libinputreporter",
		"libinputreader",
		"libbinder",
		"libcrypto",
		"libcutils",
		@@ -50,60 +54,76 @@ cc_library_shared {
		"libui",
		"server_configurable_flags",
		],
		}

		static_libs: [
		"libinputdispatcher",
		cc_library_shared {
		name: "libinputflinger",
		defaults: [
		"inputflinger_defaults",
		"libinputflinger_defaults",
		],

		cflags: [
		// TODO(b/23084678): Move inputflinger to its own process and mark it hidden
		//-fvisibility=hidden
		],

		export_include_dirs: [
		".",
		"include",
		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.
		"libinputflinger_base",
		"libinputreporter",
		"libinputreader",
		],
		static_libs: [
		"libinputdispatcher",
		],

		export_static_lib_headers: [
		"libinputdispatcher",
		],
		export_include_dirs: [
		".",
		"include",
		],
		}

		/////////////////////////////////////////////////
		// libinputflinger_base
		/////////////////////////////////////////////////

		cc_library_headers {
		name: "libinputflinger_headers",
		header_libs: ["libinputreporter_headers"],
		export_include_dirs: ["include"],
		export_header_lib_headers: ["libinputreporter_headers"],
		}

		cc_library_shared {
		name: "libinputflinger_base",
		defaults: ["inputflinger_defaults"],

		filegroup {
		name: "libinputflinger_base_sources",
		srcs: [
		"InputListener.cpp",
		"InputReaderBase.cpp",
		"InputThread.cpp",
		],
		}

		cc_defaults {
		name: "libinputflinger_base_defaults",
		srcs: [":libinputflinger_base_sources"],
		shared_libs: [
		"libbase",
		"libinput",
		"liblog",
		"libutils",
		],

		header_libs: [
		"libinputflinger_headers",
		],
		}

		cc_library_shared {
		name: "libinputflinger_base",
		defaults: [
		"inputflinger_defaults",
		"libinputflinger_base_defaults",
		],
		export_header_lib_headers: [
		"libinputflinger_headers",
		],
		}

		subdirs = [
		"host",
		"tests",
		]

services/inputflinger/dispatcher/Android.bp

+34 −7

Original line number	Diff line number	Diff line
		@@ -12,9 +12,15 @@
		// See the License for the specific language governing permissions and
		// limitations under the License.

		cc_library_static {
		name: "libinputdispatcher",
		defaults: ["inputflinger_defaults"],
		cc_library_headers {
		name: "libinputdispatcher_headers",
		export_include_dirs: [
		"include",
		],
		}

		filegroup {
		name: "libinputdispatcher_sources",
		srcs: [
		"Connection.cpp",
		"Entry.cpp",
		@@ -24,20 +30,41 @@ cc_library_static {
		"InputState.cpp",
		"InputTarget.cpp",
		"Monitor.cpp",
		"TouchState.cpp"
		"TouchState.cpp",
		],
		}

		cc_defaults {
		name: "libinputdispatcher_defaults",
		srcs: [":libinputdispatcher_sources"],
		shared_libs: [
		"libbase",
		"libcrypto",
		"libcutils",
		"libinput",
		"libinputreporter",
		"libinputflinger_base",
		"liblog",
		"libstatslog",
		"libui",
		"libutils",
		],
		header_libs: [
		"libinputdispatcher_headers",
		],
		}

		export_include_dirs: ["include"],
		cc_library_static {
		name: "libinputdispatcher",
		defaults: [
		"inputflinger_defaults",
		"libinputdispatcher_defaults",
		],
		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.
		"libinputreporter",
		"libinputflinger_base",
		],
		export_header_lib_headers: [
		"libinputdispatcher_headers",
		],
		}

services/inputflinger/reader/Android.bp

+22 −9

Original line number	Diff line number	Diff line
		@@ -21,10 +21,8 @@ cc_library_headers {
		],
		}

		cc_library_shared {
		name: "libinputreader",
		defaults: ["inputflinger_defaults"],

		filegroup {
		name: "libinputreader_sources",
		srcs: [
		"EventHub.cpp",
		"InputDevice.cpp",
		@@ -44,14 +42,16 @@ cc_library_shared {
		"mapper/TouchInputMapper.cpp",
		"mapper/VibratorInputMapper.cpp",
		"InputReader.cpp",
		"InputReaderFactory.cpp",
		"TouchVideoDevice.cpp",
		],
		}

		cc_defaults {
		name: "libinputreader_defaults",
		srcs: [":libinputreader_sources"],
		shared_libs: [
		"libbase",
		"libcap",
		"libinputflinger_base",
		"libcrypto",
		"libcutils",
		"libinput",
		@@ -59,13 +59,26 @@ cc_library_shared {
		"libui",
		"libutils",
		],

		header_libs: [
		"libinputflinger_headers",
		"libinputreader_headers",
		],
		}

		cc_library_shared {
		name: "libinputreader",
		defaults: [
		"inputflinger_defaults",
		"libinputreader_defaults"
		],
		srcs: [
		"InputReaderFactory.cpp",
		],
		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.
		"libinputflinger_base",
		],
		export_header_lib_headers: [
		"libinputflinger_headers",
		"libinputreader_headers",
		],
		}

services/inputflinger/reader/mapper/CursorInputMapper.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		#include "Macros.h"
		#include "../Macros.h"

		#include "CursorInputMapper.h"

services/inputflinger/reader/mapper/ExternalStylusInputMapper.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		#include "Macros.h"
		#include "../Macros.h"

		#include "ExternalStylusInputMapper.h"