diff options
| -rw-r--r-- | include/android/input.h | 8 | ||||
| -rw-r--r-- | include/android/looper.h | 8 | ||||
| -rw-r--r-- | include/android/sensor.h | 9 | ||||
| -rw-r--r-- | libs/binder/tests/Android.bp | 6 | ||||
| -rw-r--r-- | services/inputflinger/Android.bp | 6 | ||||
| -rw-r--r-- | services/inputflinger/dispatcher/Android.bp | 6 | ||||
| -rw-r--r-- | services/inputflinger/reader/Android.bp | 1 |
7 files changed, 25 insertions, 19 deletions
diff --git a/include/android/input.h b/include/android/input.h index a45f065dd0..8c2a247ad2 100644 --- a/include/android/input.h +++ b/include/android/input.h @@ -54,16 +54,12 @@ #include <stdint.h> #include <sys/types.h> #include <android/keycodes.h> - -// This file is included by modules that have host support but android/looper.h is not supported -// on host. __REMOVED_IN needs to be defined in order for android/looper.h to be compiled. -#ifndef __BIONIC__ -#define __REMOVED_IN(x) __attribute__((deprecated)) -#endif #include <android/looper.h> #include <jni.h> +// This file may also be built on glibc or on Windows/MacOS libc's, so no-op +// definitions are provided. #if !defined(__INTRODUCED_IN) #define __INTRODUCED_IN(__api_level) /* nothing */ #endif diff --git a/include/android/looper.h b/include/android/looper.h index 4fe142a8e2..e50730d5c1 100644 --- a/include/android/looper.h +++ b/include/android/looper.h @@ -26,10 +26,18 @@ #ifndef ANDROID_LOOPER_H #define ANDROID_LOOPER_H +#include <sys/cdefs.h> + #ifdef __cplusplus extern "C" { #endif +// This file may also be built on glibc or on Windows/MacOS libc's, so +// deprecated definitions are provided. +#if !defined(__REMOVED_IN) +#define __REMOVED_IN(__api_level) __attribute__((__deprecated__)) +#endif + struct ALooper; /** * ALooper diff --git a/include/android/sensor.h b/include/android/sensor.h index 16c5dde60f..0cc7834420 100644 --- a/include/android/sensor.h +++ b/include/android/sensor.h @@ -29,6 +29,8 @@ #ifndef ANDROID_SENSOR_H #define ANDROID_SENSOR_H +#include <sys/cdefs.h> + /****************************************************************** * * IMPORTANT NOTICE: @@ -45,11 +47,6 @@ * - DO NOT CHANGE THE LAYOUT OR SIZE OF STRUCTURES */ -// This file is included by modules that have host support but android/looper.h is not supported -// on host. __REMOVED_IN needs to be defined in order for android/looper.h to be compiled. -#ifndef __BIONIC__ -#define __REMOVED_IN(x) __attribute__((deprecated)) -#endif #include <android/looper.h> #include <stdbool.h> @@ -57,6 +54,8 @@ #include <math.h> #include <stdint.h> +// This file may also be built on glibc or on Windows/MacOS libc's, so no-op +// and deprecated definitions are provided. #if !defined(__INTRODUCED_IN) #define __INTRODUCED_IN(__api_level) /* nothing */ #endif diff --git a/libs/binder/tests/Android.bp b/libs/binder/tests/Android.bp index 873e9550f9..f2c0465726 100644 --- a/libs/binder/tests/Android.bp +++ b/libs/binder/tests/Android.bp @@ -243,6 +243,12 @@ cc_defaults { // contention on the device. b/276820894 test_options: { unit_test: false, + test_runner_options: [ + { + name: "native-test-timeout", + value: "10m", + }, + ], }, test_suites: ["general-tests"], diff --git a/services/inputflinger/Android.bp b/services/inputflinger/Android.bp index 69df45bc3e..c90aef9efd 100644 --- a/services/inputflinger/Android.bp +++ b/services/inputflinger/Android.bp @@ -83,6 +83,8 @@ cc_defaults { "libprotobuf-cpp-lite", "libstatslog", "libutils", + "libstatspull", + "libstatssocket", "server_configurable_flags", ], static_libs: [ @@ -95,15 +97,11 @@ cc_defaults { shared_libs: [ "libgui", "libinput", - "libstatspull", - "libstatssocket", ], }, host: { static_libs: [ "libinput", - "libstatspull", - "libstatssocket", ], }, }, diff --git a/services/inputflinger/dispatcher/Android.bp b/services/inputflinger/dispatcher/Android.bp index da4e42f4fe..d273da0b6f 100644 --- a/services/inputflinger/dispatcher/Android.bp +++ b/services/inputflinger/dispatcher/Android.bp @@ -64,6 +64,8 @@ cc_defaults { "libprotobuf-cpp-lite", "libstatslog", "libutils", + "libstatspull", + "libstatssocket", "server_configurable_flags", ], static_libs: [ @@ -75,15 +77,11 @@ cc_defaults { shared_libs: [ "libgui", "libinput", - "libstatspull", - "libstatssocket", ], }, host: { static_libs: [ "libinput", - "libstatspull", - "libstatssocket", ], }, }, diff --git a/services/inputflinger/reader/Android.bp b/services/inputflinger/reader/Android.bp index b0edb5746c..1ae36e768f 100644 --- a/services/inputflinger/reader/Android.bp +++ b/services/inputflinger/reader/Android.bp @@ -82,6 +82,7 @@ cc_defaults { "liblog", "libPlatformProperties", "libstatslog", + "libstatspull", "libutils", ], static_libs: [ |