Merge "input: run bpfmt -w -s on all Android.bp files" into main (01e3f8a3) · Commits · e / os / android_frameworks_native

libs/input/Android.bp

+48 −48

Original line number	Diff line number	Diff line
		@@ -27,9 +27,9 @@ filegroup {
		name: "inputconstants_aidl",
		srcs: [
		"android/os/IInputConstants.aidl",
		"android/os/InputConfig.aidl",
		"android/os/InputEventInjectionResult.aidl",
		"android/os/InputEventInjectionSync.aidl",
		"android/os/InputConfig.aidl",
		"android/os/MotionEventFlag.aidl",
		"android/os/PointerIconType.aidl",
		],
		@@ -85,56 +85,56 @@ rust_bindgen {
		source_stem: "bindings",

		bindgen_flags: [
		"--verbose",
		"--allowlist-var=AMOTION_EVENT_ACTION_CANCEL",
		"--allowlist-var=AMOTION_EVENT_ACTION_UP",
		"--allowlist-var=AMOTION_EVENT_ACTION_POINTER_DOWN",
		"--allowlist-var=AMOTION_EVENT_ACTION_DOWN",
		"--allowlist-var=AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT",
		"--allowlist-var=MAX_POINTER_ID",
		"--allowlist-var=AINPUT_SOURCE_CLASS_NONE",
		"--allowlist-var=AINPUT_KEYBOARD_TYPE_ALPHABETIC",
		"--allowlist-var=AINPUT_KEYBOARD_TYPE_NONE",
		"--allowlist-var=AINPUT_KEYBOARD_TYPE_NON_ALPHABETIC",
		"--allowlist-var=AINPUT_SOURCE_BLUETOOTH_STYLUS",
		"--allowlist-var=AINPUT_SOURCE_CLASS_BUTTON",
		"--allowlist-var=AINPUT_SOURCE_CLASS_POINTER",
		"--allowlist-var=AINPUT_SOURCE_CLASS_JOYSTICK",
		"--allowlist-var=AINPUT_SOURCE_CLASS_NAVIGATION",
		"--allowlist-var=AINPUT_SOURCE_CLASS_NONE",
		"--allowlist-var=AINPUT_SOURCE_CLASS_POINTER",
		"--allowlist-var=AINPUT_SOURCE_CLASS_POSITION",
		"--allowlist-var=AINPUT_SOURCE_CLASS_JOYSTICK",
		"--allowlist-var=AINPUT_SOURCE_UNKNOWN",
		"--allowlist-var=AINPUT_SOURCE_KEYBOARD",
		"--allowlist-var=AINPUT_SOURCE_DPAD",
		"--allowlist-var=AINPUT_SOURCE_GAMEPAD",
		"--allowlist-var=AINPUT_SOURCE_TOUCHSCREEN",
		"--allowlist-var=AINPUT_SOURCE_HDMI",
		"--allowlist-var=AINPUT_SOURCE_JOYSTICK",
		"--allowlist-var=AINPUT_SOURCE_KEYBOARD",
		"--allowlist-var=AINPUT_SOURCE_MOUSE",
		"--allowlist-var=AINPUT_SOURCE_STYLUS",
		"--allowlist-var=AINPUT_SOURCE_BLUETOOTH_STYLUS",
		"--allowlist-var=AINPUT_SOURCE_TRACKBALL",
		"--allowlist-var=AINPUT_SOURCE_MOUSE_RELATIVE",
		"--allowlist-var=AINPUT_SOURCE_ROTARY_ENCODER",
		"--allowlist-var=AINPUT_SOURCE_SENSOR",
		"--allowlist-var=AINPUT_SOURCE_STYLUS",
		"--allowlist-var=AINPUT_SOURCE_TOUCHPAD",
		"--allowlist-var=AINPUT_SOURCE_TOUCHSCREEN",
		"--allowlist-var=AINPUT_SOURCE_TOUCH_NAVIGATION",
		"--allowlist-var=AINPUT_SOURCE_JOYSTICK",
		"--allowlist-var=AINPUT_SOURCE_HDMI",
		"--allowlist-var=AINPUT_SOURCE_SENSOR",
		"--allowlist-var=AINPUT_SOURCE_ROTARY_ENCODER",
		"--allowlist-var=AINPUT_KEYBOARD_TYPE_NONE",
		"--allowlist-var=AINPUT_KEYBOARD_TYPE_NON_ALPHABETIC",
		"--allowlist-var=AINPUT_KEYBOARD_TYPE_ALPHABETIC",
		"--allowlist-var=AMETA_NONE",
		"--allowlist-var=AMETA_ALT_ON",
		"--allowlist-var=AINPUT_SOURCE_TRACKBALL",
		"--allowlist-var=AINPUT_SOURCE_UNKNOWN",
		"--allowlist-var=AMETA_ALT_LEFT_ON",
		"--allowlist-var=AMETA_ALT_ON",
		"--allowlist-var=AMETA_ALT_RIGHT_ON",
		"--allowlist-var=AMETA_SHIFT_ON",
		"--allowlist-var=AMETA_SHIFT_LEFT_ON",
		"--allowlist-var=AMETA_SHIFT_RIGHT_ON",
		"--allowlist-var=AMETA_SYM_ON",
		"--allowlist-var=AMETA_FUNCTION_ON",
		"--allowlist-var=AMETA_CTRL_ON",
		"--allowlist-var=AMETA_CAPS_LOCK_ON",
		"--allowlist-var=AMETA_CTRL_LEFT_ON",
		"--allowlist-var=AMETA_CTRL_ON",
		"--allowlist-var=AMETA_CTRL_RIGHT_ON",
		"--allowlist-var=AMETA_META_ON",
		"--allowlist-var=AMETA_FUNCTION_ON",
		"--allowlist-var=AMETA_META_LEFT_ON",
		"--allowlist-var=AMETA_META_ON",
		"--allowlist-var=AMETA_META_RIGHT_ON",
		"--allowlist-var=AMETA_CAPS_LOCK_ON",
		"--allowlist-var=AMETA_NONE",
		"--allowlist-var=AMETA_NUM_LOCK_ON",
		"--allowlist-var=AMETA_SCROLL_LOCK_ON",
		"--allowlist-var=AMETA_SHIFT_LEFT_ON",
		"--allowlist-var=AMETA_SHIFT_ON",
		"--allowlist-var=AMETA_SHIFT_RIGHT_ON",
		"--allowlist-var=AMETA_SYM_ON",
		"--allowlist-var=AMOTION_EVENT_ACTION_CANCEL",
		"--allowlist-var=AMOTION_EVENT_ACTION_DOWN",
		"--allowlist-var=AMOTION_EVENT_ACTION_POINTER_DOWN",
		"--allowlist-var=AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT",
		"--allowlist-var=AMOTION_EVENT_ACTION_UP",
		"--allowlist-var=MAX_POINTER_ID",
		"--verbose",
		],

		static_libs: [
		@@ -143,9 +143,9 @@ rust_bindgen {
		],
		shared_libs: ["libc++"],
		header_libs: [
		"native_headers",
		"jni_headers",
		"flatbuffer_headers",
		"jni_headers",
		"native_headers",
		],
		}

		@@ -179,8 +179,8 @@ cc_library_static {
		host_supported: true,
		cflags: [
		"-Wall",
		"-Wextra",
		"-Werror",
		"-Wextra",
		],
		srcs: [
		"FromRustToCpp.cpp",
		@@ -205,15 +205,15 @@ cc_library {
		cpp_std: "c++20",
		host_supported: true,
		cflags: [
		"-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",
		"-Wall",
		"-Wextra",
		"-Werror",
		"-Wextra",
		"-Wno-unused-parameter",
		"-Wthread-safety",
		"-Wshadow",
		"-Wshadow-field-in-constructor-modified",
		"-Wshadow-uncaptured-local",
		"-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",
		"-Wthread-safety",
		],
		srcs: [
		"AccelerationCurve.cpp",
		@@ -225,10 +225,10 @@ cc_library {
		"InputEventLabels.cpp",
		"InputTransport.cpp",
		"InputVerifier.cpp",
		"Keyboard.cpp",
		"KeyCharacterMap.cpp",
		"KeyboardClassifier.cpp",
		"KeyLayoutMap.cpp",
		"Keyboard.cpp",
		"KeyboardClassifier.cpp",
		"MotionPredictor.cpp",
		"MotionPredictorMetricsManager.cpp",
		"OneEuroFilter.cpp",
		@@ -262,13 +262,13 @@ cc_library {

		shared_libs: [
		"android.companion.virtualdevice.flags-aconfig-cc",
		"libPlatformProperties",
		"libaconfig_storage_read_api_cc",
		"libbase",
		"libbinder",
		"libbinder_ndk",
		"libcutils",
		"liblog",
		"libPlatformProperties",
		"libtinyxml2",
		"libutils",
		"libz", // needed by libkernelconfigs
		@@ -287,15 +287,15 @@ cc_library {

		static_libs: [
		"inputconstants-cpp",
		"libui-types",
		"libtflite_static",
		"libkernelconfigs",
		"libtflite_static",
		"libui-types",
		],

		whole_static_libs: [
		"com.android.input.flags-aconfig-cc",
		"libinput_rust_ffi",
		"iinputflinger_aidl_lib_static",
		"libinput_rust_ffi",
		],

		export_static_lib_headers: [
		@@ -310,8 +310,8 @@ cc_library {
		target: {
		android: {
		required: [
		"motion_predictor_model_prebuilt",
		"motion_predictor_model_config",
		"motion_predictor_model_prebuilt",
		],
		static_libs: [
		"libstatslog_libinput",
		@@ -372,9 +372,9 @@ cc_defaults {
		cpp_std: "c++20",
		host_supported: true,
		shared_libs: [
		"libutils",
		"libbase",
		"liblog",
		"libutils",
		],
		}

libs/input/rust/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -18,12 +18,12 @@ rust_defaults {
		srcs: ["lib.rs"],
		host_supported: true,
		rustlibs: [
		"inputconstants-rust",
		"libbitflags",
		"libcxx",
		"libinput_bindgen",
		"liblogger",
		"liblog_rust",
		"inputconstants-rust",
		"liblogger",
		"libserde",
		"libserde_json",
		],

libs/input/tests/Android.bp

+10 −10

Original line number	Diff line number	Diff line
		@@ -16,16 +16,16 @@ cc_test {
		"BlockingQueue_test.cpp",
		"IdGenerator_test.cpp",
		"InputChannel_test.cpp",
		"InputConsumer_test.cpp",
		"InputConsumerFilteredResampling_test.cpp",
		"InputConsumerResampling_test.cpp",
		"InputConsumer_test.cpp",
		"InputDevice_test.cpp",
		"InputEvent_test.cpp",
		"InputPublisherAndConsumer_test.cpp",
		"InputPublisherAndConsumerNoResampling_test.cpp",
		"InputPublisherAndConsumer_test.cpp",
		"InputVerifier_test.cpp",
		"MotionPredictor_test.cpp",
		"MotionPredictorMetricsManager_test.cpp",
		"MotionPredictor_test.cpp",
		"OneEuroFilter_test.cpp",
		"Resampler_test.cpp",
		"RingBuffer_test.cpp",
		@@ -53,8 +53,8 @@ cc_test {
		],
		cflags: [
		"-Wall",
		"-Wextra",
		"-Werror",
		"-Wextra",
		"-Wno-unused-parameter",
		],
		sanitize: {
		@@ -68,26 +68,26 @@ cc_test {
		memtag_heap: true,
		undefined: true,
		misc_undefined: [
		"bounds",
		"all",
		"bounds",
		],
		},
		},
		shared_libs: [
		"libPlatformProperties",
		"libaconfig_storage_read_api_cc",
		"libbase",
		"libbinder",
		"libcutils",
		"liblog",
		"libPlatformProperties",
		"libstatslog",
		"libtinyxml2",
		"libutils",
		"server_configurable_flags",
		],
		data: [
		"data/*",
		":motion_predictor_model",
		"data/*",
		],
		test_options: {
		unit_test: true,
		@@ -117,10 +117,10 @@ cc_library_static {
		"-Wextra",
		],
		shared_libs: [
		"libinput",
		"libbase",
		"libbinder",
		"libcutils",
		"libinput",
		"libutils",
		"libbinder",
		"libbase",
		],
		}

services/inputflinger/Android.bp

+35 −44

Original line number	Diff line number	Diff line
		@@ -32,15 +32,15 @@ cc_defaults {
		host_supported: true,
		cpp_std: "c++20",
		cflags: [
		"-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",
		"-Wall",
		"-Wextra",
		"-Werror",
		"-Wextra",
		"-Wno-unused-parameter",
		"-Wthread-safety",
		"-Wshadow",
		"-Wshadow-field-in-constructor-modified",
		"-Wshadow-uncaptured-local",
		"-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",
		"-Wthread-safety",
		],
		sanitize: {
		misc_undefined: [
		@@ -62,8 +62,8 @@ cc_defaults {
		memtag_heap: true,
		undefined: true,
		misc_undefined: [
		"bounds",
		"all",
		"bounds",
		],
		},
		},
		@@ -114,16 +114,16 @@ cc_defaults {
		"liblog",
		"libprotobuf-cpp-lite",
		"libstatslog",
		"libutils",
		"libstatspull",
		"libstatssocket",
		"libutils",
		"packagemanager_aidl-cpp",
		"server_configurable_flags",
		],
		static_libs: [
		"libattestation",
		"libperfetto_client_experimental",
		"libpalmrejection",
		"libperfetto_client_experimental",
		"libui-types",
		],
		generated_headers: [
		@@ -161,10 +161,10 @@ 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.
		"libPlatformProperties",
		"libinputflinger_base",
		"libinputreader",
		"libinputreporter",
		"libPlatformProperties",
		],
		static_libs: [
		"libinputdispatcher",
		@@ -185,8 +185,8 @@ cc_library_headers {
		name: "libinputflinger_headers",
		host_supported: true,
		export_include_dirs: [
		"include",
		".",
		"include",
		],
		header_libs: [
		"libchrome-gestures_headers",
		@@ -247,49 +247,40 @@ cc_library_shared {
		phony {
		name: "checkinput",
		required: [
		// native targets
		"libgui_test",
		"libinput",
		"libinputreader_static",
		"libinputflinger",
		"inputflinger_tests",
		"inputflinger_benchmarks",
		"libinput_tests",
		"libpalmrejection_test",
		"libandroid_runtime",
		"libinputservice_test",
		"Bug-115739809",
		"StructLayout_test",

		// jni
		"libservices.core",

		// rust targets
		"libinput_rust_test",

		// native fuzzers
		"inputflinger_latencytracker_fuzzer",
		"inputflinger_cursor_input_fuzzer",
		"inputflinger_keyboard_input_fuzzer",
		"inputflinger_multitouch_input_fuzzer",
		"inputflinger_switch_input_fuzzer",
		"inputflinger_touchpad_input_fuzzer",
		"inputflinger_input_reader_fuzzer",
		"inputflinger_blocking_queue_fuzzer",
		"inputflinger_input_classifier_fuzzer",
		"inputflinger_input_dispatcher_fuzzer",

		// Java/Kotlin targets
		"CtsWindowManagerDeviceWindow",
		"InputTests",
		"CtsHardwareTestCases",
		"CtsInputTestCases",
		"CtsSecurityBulletinHostTestCases",
		"CtsSecurityTestCases",
		"CtsViewTestCases",
		"CtsWidgetTestCases",
		"CtsWindowManagerDeviceWindow",
		"FrameworksCoreTests",
		"FrameworksServicesTests",
		"CtsSecurityTestCases",
		"CtsSecurityBulletinHostTestCases",
		"InputTests",
		"StructLayout_test",
		"inputflinger_benchmarks",
		"inputflinger_blocking_queue_fuzzer",
		"inputflinger_cursor_input_fuzzer",
		"inputflinger_input_classifier_fuzzer",
		"inputflinger_input_dispatcher_fuzzer",
		"inputflinger_input_reader_fuzzer",
		"inputflinger_keyboard_input_fuzzer",
		"inputflinger_latencytracker_fuzzer",
		"inputflinger_multitouch_input_fuzzer",
		"inputflinger_switch_input_fuzzer",
		"inputflinger_tests",
		"inputflinger_touchpad_input_fuzzer",
		"libandroid_runtime",
		"libgui_test",
		"libinput",
		"libinput_rust_test",
		"libinput_tests",
		"libinputflinger",
		"libinputreader_static",
		"libinputservice_test",
		"libpalmrejection_test",
		"libservices.core",
		"monkey_test",
		],
		}

services/inputflinger/dispatcher/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -49,8 +49,8 @@ filegroup {
		"LatencyAggregatorWithHistograms.cpp",
		"LatencyTracker.cpp",
		"Monitor.cpp",
		"TouchedWindow.cpp",
		"TouchState.cpp",
		"TouchedWindow.cpp",
		"trace/*.cpp",
		],
		}
		@@ -71,9 +71,9 @@ cc_defaults {
		"liblog",
		"libprotobuf-cpp-lite",
		"libstatslog",
		"libutils",
		"libstatspull",
		"libstatssocket",
		"libutils",
		"packagemanager_aidl-cpp",
		"server_configurable_flags",
		],