diff options
| author | 2023-07-11 10:48:18 -0700 | |
|---|---|---|
| committer | 2024-01-18 18:48:22 +0000 | |
| commit | 1aa9f86ffdca67e2d007079fcb091fcb5c53dda7 (patch) | |
| tree | 0841b06d64fcc31859ad7c7aa8c5fbaeb72e8865 | |
| parent | 57ca711d78eac7be5111bc9dfd20548d603dd483 (diff) | |
[Cherry-pick] Add sys/cdefs and __REMOVED_IN define to looper.h
The looper.h header introduced __REMOVED_IN, which requires the
sys/cdefs.h header to provide definitions for the macro. Add them here
and update files that include looper.h to not provide their own
definitions of __REMOVED_IN. Further, update comments to clarify that
the additional defines are in place to satisfy builds that use glibc or
Windows/MacOS libcs.
Bug: 14257980
Change-Id: Ia524b7e180c5137e84c205a77dc219b9e9e41608
| -rw-r--r-- | include/android/input.h | 8 | ||||
| -rw-r--r-- | include/android/looper.h | 8 | ||||
| -rw-r--r-- | include/android/sensor.h | 9 |
3 files changed, 14 insertions, 11 deletions
diff --git a/include/android/input.h b/include/android/input.h index 9a0eb4d838..16d86af44c 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 |