diff options
-rw-r--r-- | include/android/bitmap.h | 15 | ||||
-rw-r--r-- | include/android/imagedecoder.h | 14 | ||||
-rw-r--r-- | libs/nativewindow/Android.bp | 1 |
3 files changed, 30 insertions, 0 deletions
diff --git a/include/android/bitmap.h b/include/android/bitmap.h index 36f70d8e15..2362c9e491 100644 --- a/include/android/bitmap.h +++ b/include/android/bitmap.h @@ -28,8 +28,23 @@ #include <stdbool.h> #include <stdint.h> +#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 +#endif + #ifdef __cplusplus extern "C" { #endif diff --git a/include/android/imagedecoder.h b/include/android/imagedecoder.h index 2aac33cf7e..48d217f765 100644 --- a/include/android/imagedecoder.h +++ b/include/android/imagedecoder.h @@ -51,6 +51,20 @@ #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 +#endif + #ifdef __cplusplus extern "C" { #endif diff --git a/libs/nativewindow/Android.bp b/libs/nativewindow/Android.bp index 07e5d860d7..3011dccf1e 100644 --- a/libs/nativewindow/Android.bp +++ b/libs/nativewindow/Android.bp @@ -28,6 +28,7 @@ cc_library_headers { // TODO(b/153609531): remove when no longer needed. native_bridge_supported: true, min_sdk_version: "29", + host_supported: true, } ndk_library { |