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

Commit 0e701fd2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "fallout of splitting rect.h out of libandroid."

parents c01ea695 bc1713d3

camera/cameraserver/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ LOCAL_SHARED_LIBRARIES := \ 
	libcameraservice \

	liblog \

	libutils \

	libui \

	libbinder \

	android.hardware.camera.common@1.0 \

	android.hardware.camera.provider@2.4 \

include/media/IOMX.h

+1 −1
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 
#define ANDROID_IOMX_H_



#include <binder/IInterface.h>

#include <gui/IGraphicBufferProducer.h>

#include <utils/List.h>

#include <utils/String8.h>

#include <cutils/native_handle.h>



#include <list>

include/media/stagefright/ACodec.h

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <media/stagefright/SkipCutBuffer.h>

#include <utils/NativeHandle.h>

#include <OMX_Audio.h>

#include <hardware/gralloc.h>



#define TRACK_BUFFER_TIMING     0

include/ndk/NdkMediaCodec.h

+2 −2
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ 


#include <sys/cdefs.h>



#include <android/native_window.h>



#include "NdkMediaCrypto.h"

#include "NdkMediaError.h"

#include "NdkMediaFormat.h"
@@ -39,6 +37,8 @@ 
extern "C" {

#endif



struct ANativeWindow;



#if __ANDROID_API__ >= 21



struct AMediaCodec;

media/libmedia/IOMX.cpp

+2 −1
Original line number Diff line number Diff line
@@ -25,8 +25,9 @@ 
#include <media/IOMX.h>

#include <media/stagefright/foundation/ADebug.h>

#include <media/openmax/OMX_IndexExt.h>

#include <utils/NativeHandle.h>

#include <media/OMXBuffer.h>

#include <utils/NativeHandle.h>

#include <gui/IGraphicBufferProducer.h>



#include <android/IGraphicBufferSource.h>

#include <android/IOMXBufferSource.h>