Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1e7a5ba authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "Stop #define'ing __ANDROID_API__." am: 94be650e am: 73a4ac7d am:... 

Merge "Stop #define'ing __ANDROID_API__." am: 94be650e am: 73a4ac7d am: 677f8c48 am: 627873f3

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1580211

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib23bd5905222f34a081871552fb9c21750ec8a5b
parents d2ab8e2e 627873f3

include/android/bitmap.h

+2 −12
Original line number Diff line number Diff line
@@ -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

include/android/imagedecoder.h

+2 −12
Original line number Diff line number Diff line
@@ -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