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

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

Merge "Stop #define'ing __ANDROID_API__." am: e445740e am: a79364cc 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1581003

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c5a770999c6f66890c9f9c72c2abe82d3b95ef9
parents 69505392 a79364cc

media/extractors/flac/Android.bp

+1 −1
Original line number Diff line number Diff line 
cc_library {

    name: "libflacextractor",

    defaults: ["extractor-defaults"],

    defaults: ["extractor-defaults", "libbinder_ndk_host_user"],



    srcs: ["FLACExtractor.cpp"],

media/extractors/wav/Android.bp

+1 −1
Original line number Diff line number Diff line 
cc_library {

    name: "libwavextractor",



    defaults: ["extractor-defaults"],

    defaults: ["extractor-defaults", "libbinder_ndk_host_user"],



    srcs: ["WAVExtractor.cpp"],

media/ndk/include/media/NdkMediaFormat.h

+2 −12
Original line number Diff line number Diff line
@@ -40,18 +40,8 @@ 
#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

#if !defined(__INTRODUCED_IN)

#define __INTRODUCED_IN(__api_level) /* nothing */

#endif



#include "NdkMediaError.h"