summaryrefslogtreecommitdiffstats
path: root/media/libmedia/Android.mk
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2016-05-13 10:39:23 -0700
committerThe Android Automerger <android-build@google.com>2016-05-27 11:30:16 -0700
commit6fdee2a83432b3b150d6a34f231c4e2f7353c01e (patch)
tree89d951e6e825431c6e0fe175d1d5df0ae31ec3e1 /media/libmedia/Android.mk
parente7142a0703bc93f75e213e96ebc19000022afed9 (diff)
downloadframeworks_av-6fdee2a83432b3b150d6a34f231c4e2f7353c01e.zip
frameworks_av-6fdee2a83432b3b150d6a34f231c4e2f7353c01e.tar.gz
frameworks_av-6fdee2a83432b3b150d6a34f231c4e2f7353c01e.tar.bz2
limit mediaserver memory
Limit mediaserver using rlimit, to prevent it from bringing down the system via the low memory killer. Default max is 65% of total RAM, but can be customized via system property. Bug: 28471206 Bug: 28615448 Change-Id: Ic84137435d1ef0a6883e9789a4b4f399e4283f05
Diffstat (limited to 'media/libmedia/Android.mk')
-rw-r--r--media/libmedia/Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk
index a3c3d3c..9f836f0 100644
--- a/media/libmedia/Android.mk
+++ b/media/libmedia/Android.mk
@@ -44,6 +44,7 @@ LOCAL_SRC_FILES:= \
IResourceManagerService.cpp \
IStreamSource.cpp \
MediaCodecInfo.cpp \
+ MediaUtils.cpp \
Metadata.cpp \
mediarecorder.cpp \
IMediaMetadataRetriever.cpp \