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

Commit 67fce9d7 authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "MediaUtils: Move MemoryLeakTrackUtil.h to the proper library." into... 

Merge "MediaUtils: Move MemoryLeakTrackUtil.h to the proper library." into rvc-dev am: 65328604 am: 79876130 am: 72986627

Change-Id: Ice7e51b49e8158cbdad4f7d6b36e29f8bfb6d396
parents ae17ceda 72986627

drm/drmserver/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ cc_binary { 
    ],



    shared_libs: [

        "libmedia",

        "libmediametrics",

        "libmediautils",

        "libcutils",

        "libutils",

        "liblog",

drm/drmserver/DrmManagerService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <utils/Log.h>



#include <private/android_filesystem_config.h>

#include <media/MemoryLeakTrackUtil.h>

#include <mediautils/MemoryLeakTrackUtil.h>



#include <errno.h>

#include <utils/threads.h>

media/libmediaplayerservice/MediaPlayerService.cpp

+1 −2
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ 
#include <media/MediaMetadataRetrieverInterface.h>

#include <media/Metadata.h>

#include <media/AudioTrack.h>

#include <media/MemoryLeakTrackUtil.h>

#include <media/stagefright/InterfaceUtils.h>

#include <media/stagefright/MediaCodecConstants.h>

#include <media/stagefright/MediaCodecList.h>
@@ -68,7 +67,7 @@ 
#include <media/stagefright/foundation/ALooperRoster.h>

#include <media/stagefright/SurfaceUtils.h>

#include <mediautils/BatteryNotifier.h>



#include <mediautils/MemoryLeakTrackUtil.h>

#include <memunreachable/memunreachable.h>

#include <system/audio.h>

media/utils/MemoryLeakTrackUtil.cpp

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#define LOG_TAG "MemoryLeackTrackUtil"

#include <utils/Log.h>



#include "media/MemoryLeakTrackUtil.h"

#include <mediautils/MemoryLeakTrackUtil.h>

#include <sstream>



#include <bionic/malloc.h>