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

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

Merge "MediaPlayer2: move MediaPlayer2 native code to libmediaplayer2"

parents c65eb444 c3c31a53

media/jni/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -127,11 +127,11 @@ cc_library_shared { 
        "liblzma",

        "libmedia",

        "libmedia_helper",

        "libmedia_player2",

        "libmedia_player2_util",

        "libmediadrm",

        "libmediaextractor",

        "libmediametrics",

        "libmediaplayer2",

        "libmediautils",

        "libnativehelper",

        "libnetd_client",

media/jni/android_media_MediaPlayer2.cpp

+1 −2
Original line number Diff line number Diff line
@@ -21,15 +21,14 @@ 


#include <sys/stat.h>



#include <media/mediaplayer2.h>

#include <media/AudioResamplerPublic.h>

#include <media/DataSourceDesc.h>

#include <media/MediaHTTPService.h>

#include <media/MediaPlayer2Interface.h>

#include <media/MediaAnalyticsItem.h>

#include <media/NdkWrapper.h>

#include <media/stagefright/Utils.h>

#include <media/stagefright/foundation/ByteUtils.h>  // for FOURCC definition

#include <mediaplayer2/mediaplayer2.h>

#include <stdio.h>

#include <assert.h>

#include <limits.h>