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

Commit 74826796 authored by Kris Alder's avatar Kris Alder Committed by Automerger Merge Worker
Browse files

Merge "NdkMediaFormat.h: Updated to include Android API macros" am: f96e7577...

Merge "NdkMediaFormat.h: Updated to include Android API macros" am: f96e7577 am: 9c846399 am: c9041371 am: a5fd80eb

Change-Id: Ib55b844eeb344312f47da52316e2057203bc51c8
parents b59744b9 a5fd80eb
Loading
Loading
Loading
Loading
+14 −0
Original line number Diff line number Diff line
@@ -39,6 +39,20 @@
#include <sys/cdefs.h>
#include <sys/types.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

#include "NdkMediaError.h"

__BEGIN_DECLS