commit 6c1ad0dea93e4eb7c2a2ede1f3be9dcf07417455
author Marco Nelissen <marcone@google.com> Fri May 13 10:39:23 2016 -0700
committer Marco Nelissen <marcone@google.com> Mon May 23 16:05:57 2016 -0700
tree d2a9da13d47a584d20675079afd4e6783ea79442
parent eaa4d780120dd690be2ae035ef4e715026b5b12e

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

media/mediaserver/Android.mk

diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk
index b6de0d9..7e017b9 100644
--- a/media/mediaserver/Android.mk
+++ b/media/mediaserver/Android.mk
@@ -37,6 +37,7 @@
 
 LOCAL_C_INCLUDES := \
     frameworks/av/media/libmediaplayerservice \
+    frameworks/av/media/libmedia \
     frameworks/av/services/medialog \
     frameworks/av/services/audioflinger \
     frameworks/av/services/audiopolicy \