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

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

Merge "MediaMetrics: limit maximum memory used" into rvc-dev am: 3006a835 am: e3b011a1 

Change-Id: I2ab0a70fc5dadba8f745c93b6be8a7940d4145d9
parents 33912a42 e3b011a1

media/audioserver/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ LOCAL_C_INCLUDES := \ 
	frameworks/av/media/libaaudio/include \

	frameworks/av/media/libaaudio/src \

	frameworks/av/media/libaaudio/src/binding \

	frameworks/av/media/libmedia \

	frameworks/av/media/libmedia/include \

	external/sonic \



LOCAL_MODULE := audioserver

media/audioserver/main_audioserver.cpp

+1 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <binder/ProcessState.h>

#include <binder/IServiceManager.h>

#include <hidl/HidlTransportSupport.h>

#include <media/MediaUtils.h>

#include <utils/Log.h>



// from LOCAL_C_INCLUDES
@@ -35,7 +36,6 @@ 
#include "AAudioService.h"

#include "utility/AAudioUtilities.h"

#include "MediaLogService.h"

#include "MediaUtils.h"



using namespace android;

media/libmedia/MediaUtils.cpp

+1 −2
Original line number Diff line number Diff line
@@ -23,8 +23,7 @@ 
#include <unistd.h>



#include <bionic/malloc.h>



#include "MediaUtils.h"

#include <media/MediaUtils.h>



extern "C" void __scudo_set_rss_limit(size_t, int) __attribute__((weak));

services/mediaextractor/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -50,8 +50,6 @@ cc_binary { 
    },

    init_rc: ["mediaextractor.rc"],



    include_dirs: ["frameworks/av/media/libmedia"],



    cflags: [

        "-Wall",

        "-Werror",