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

Commit ab1d96fa 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... 

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

Change-Id: I4da2afc2fb04e1b6d03c787bc31ee29e6c11be26
parents 8d84a672 f4a3eb5b

media/audioserver/Android.mk

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

	frameworks/av/media/libaaudio/include \

	frameworks/av/media/libaaudio/src \

	frameworks/av/media/libaaudio/src \

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

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

	frameworks/av/media/libmedia \

	frameworks/av/media/libmedia/include \

	external/sonic \

	external/sonic \





LOCAL_MODULE := audioserver

LOCAL_MODULE := audioserver

media/audioserver/main_audioserver.cpp

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

#include <binder/ProcessState.h>

#include <binder/IServiceManager.h>

#include <binder/IServiceManager.h>

#include <hidl/HidlTransportSupport.h>

#include <hidl/HidlTransportSupport.h>

#include <media/MediaUtils.h>

#include <utils/Log.h>

#include <utils/Log.h>





// from LOCAL_C_INCLUDES

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

#include "AAudioService.h"

#include "utility/AAudioUtilities.h"

#include "utility/AAudioUtilities.h"

#include "MediaLogService.h"

#include "MediaLogService.h"

#include "MediaUtils.h"





using namespace android;

using namespace android;

media/libmedia/MediaUtils.cpp

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

#include <unistd.h>





#include <bionic/malloc.h>

#include <bionic/malloc.h>



#include <media/MediaUtils.h>

#include "MediaUtils.h"





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

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

services/mediaextractor/Android.bp

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

    },

    init_rc: ["mediaextractor.rc"],

    init_rc: ["mediaextractor.rc"],





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



    cflags: [

    cflags: [

        "-Wall",

        "-Wall",

        "-Werror",

        "-Werror",