From b7425079bf06c494a4b5e190598c51148361dc64 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 26 Jan 2021 14:55:48 -0800 Subject: Remove __ANDROID_API__ #if checks. __INTRODUCED_IN() does the right thing automatically now. Bug: http://b/178449269 Test: treehugger Change-Id: I94d2ad6fafb6d907793a416db82a9e56f4f61d1c Merged-In: I94d2ad6fafb6d907793a416db82a9e56f4f61d1c --- include/android/bitmap.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'include/android/bitmap.h') diff --git a/include/android/bitmap.h b/include/android/bitmap.h index f19539913e..36f70d8e15 100644 --- a/include/android/bitmap.h +++ b/include/android/bitmap.h @@ -117,8 +117,6 @@ typedef struct { int AndroidBitmap_getInfo(JNIEnv* env, jobject jbitmap, AndroidBitmapInfo* info); -#if __ANDROID_API__ >= 30 - /** * Given a java bitmap object, return its {@link ADataSpace}. * @@ -130,8 +128,6 @@ int AndroidBitmap_getInfo(JNIEnv* env, jobject jbitmap, */ int32_t AndroidBitmap_getDataSpace(JNIEnv* env, jobject jbitmap) __INTRODUCED_IN(30); -#endif // __ANDROID_API__ >= 30 - /** * Given a java bitmap object, attempt to lock the pixel address. * Locking will ensure that the memory for the pixels will not move @@ -152,8 +148,6 @@ int AndroidBitmap_lockPixels(JNIEnv* env, jobject jbitmap, void** addrPtr); */ int AndroidBitmap_unlockPixels(JNIEnv* env, jobject jbitmap); -#if __ANDROID_API__ >= 30 - // Note: these values match android.graphics.Bitmap#compressFormat. /** @@ -254,8 +248,6 @@ typedef struct AHardwareBuffer AHardwareBuffer; int AndroidBitmap_getHardwareBuffer(JNIEnv* env, jobject bitmap, AHardwareBuffer** outBuffer) __INTRODUCED_IN(30); -#endif // __ANDROID_API__ >= 30 - #ifdef __cplusplus } #endif -- cgit v1.2.3-59-g8ed1b