diff options
| author | 2021-02-09 03:19:10 +0000 | |
|---|---|---|
| committer | 2021-02-09 03:19:10 +0000 | |
| commit | 627873f3a6fd586c6e8e21fc995d590450c13615 (patch) | |
| tree | 905b286826dd7888713a804ea5d5cc3b3d67dbc5 | |
| parent | a9b9fe40c28882f3db0b13dc9ac9b00b0fd2eab1 (diff) | |
| parent | 677f8c48f4d4376ae2853b5446c1fd639a8e00c0 (diff) | |
Merge "Stop #define'ing __ANDROID_API__." am: 94be650e36 am: 73a4ac7daf am: 677f8c48f4
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1580211
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I66d850d16d5ff7c480cb5f8506801660dbb84b3f
| -rw-r--r-- | include/android/bitmap.h | 14 | ||||
| -rw-r--r-- | include/android/imagedecoder.h | 14 |
2 files changed, 4 insertions, 24 deletions
diff --git a/include/android/bitmap.h b/include/android/bitmap.h index 2362c9e491..a70dffd756 100644 --- a/include/android/bitmap.h +++ b/include/android/bitmap.h @@ -31,18 +31,8 @@ #include <stddef.h> #include <jni.h> -#ifndef __ANDROID__ - // Value copied from 'bionic/libc/include/android/api-level.h' which is not available on - // non Android systems. It is set to 10000 which is same as __ANDROID_API_FUTURE__ value. - #ifndef __ANDROID_API__ - #define __ANDROID_API__ 10000 - #endif - - // Value copied from 'bionic/libc/include/android/versioning.h' which is not available on - // non Android systems - #ifndef __INTRODUCED_IN - #define __INTRODUCED_IN(api_level) - #endif +#if !defined(__INTRODUCED_IN) +#define __INTRODUCED_IN(__api_level) /* nothing */ #endif #ifdef __cplusplus diff --git a/include/android/imagedecoder.h b/include/android/imagedecoder.h index 819a6a4c1f..cac67d4f8f 100644 --- a/include/android/imagedecoder.h +++ b/include/android/imagedecoder.h @@ -51,18 +51,8 @@ #include <android/rect.h> #include <stdint.h> -#ifndef __ANDROID__ - // Value copied from 'bionic/libc/include/android/api-level.h' which is not available on - // non Android systems. It is set to 10000 which is same as __ANDROID_API_FUTURE__ value. - #ifndef __ANDROID_API__ - #define __ANDROID_API__ 10000 - #endif - - // Value copied from 'bionic/libc/include/android/versioning.h' which is not available on - // non Android systems - #ifndef __INTRODUCED_IN - #define __INTRODUCED_IN(api_level) - #endif +#if !defined(__INTRODUCED_IN) +#define __INTRODUCED_IN(__api_level) /* nothing */ #endif #ifdef __cplusplus |