commit d7e0dd45243735bed789589ca767485ce3fc4e7b
author Andy Hung <hunga@google.com> Fri Mar 27 16:42:34 2020 -0700
committer Andy Hung <hunga@google.com> Mon Mar 30 10:03:22 2020 -0700
tree 4ad113977dd16b064452aafdc74db03b99214e7c
parent 36696ba9a249d629c4827fda442352b396a11056

MediaMetrics: Move LimitProcessMemory to libmediautils

Eliminates the need for libmedia in media.metrics, cutting
RSS nearly in half.

Test: adb shell showmap '$(pgrep -f media.metrics)'
Test: adb shell showmap '$(pgrep -f media.extractor)'
Bug: 152256321
Change-Id: Id8aae66de84e712915888422b7372fd2b880570d

services/mediaextractor/Android.bp

diff --git a/services/mediaextractor/Android.bp b/services/mediaextractor/Android.bp
index b909ea4..0b25d62 100644
--- a/services/mediaextractor/Android.bp
+++ b/services/mediaextractor/Android.bp
@@ -29,6 +29,7 @@
     shared_libs: [
         "libmedia",
         "libmediaextractorservice",
+        "libmediautils",
         "libbinder",
         "libutils",
         "liblog",

services/mediaextractor/main_extractorservice.cpp

diff --git a/services/mediaextractor/main_extractorservice.cpp b/services/mediaextractor/main_extractorservice.cpp
index b116b14..f21574f 100644
--- a/services/mediaextractor/main_extractorservice.cpp
+++ b/services/mediaextractor/main_extractorservice.cpp
@@ -21,7 +21,7 @@
 #include <binder/IPCThreadState.h>
 #include <binder/ProcessState.h>
 #include <binder/IServiceManager.h>
-#include <media/MediaUtils.h>
+#include <mediautils/LimitProcessMemory.h>
 #include <string>
 
 #include <android-base/logging.h>

services/mediametrics/Android.bp

diff --git a/services/mediametrics/Android.bp b/services/mediametrics/Android.bp
index 30ec5b7..ec59ec1 100644
--- a/services/mediametrics/Android.bp
+++ b/services/mediametrics/Android.bp
@@ -11,7 +11,6 @@
     shared_libs: [
         "libbinder",
         "liblog",
-        "libmedia", // limitProcessMemory
         "libmediametricsservice",
         "libmediautils",
         "libutils",

services/mediametrics/main_mediametrics.cpp

diff --git a/services/mediametrics/main_mediametrics.cpp b/services/mediametrics/main_mediametrics.cpp
index 3c71e42..6992c32 100644
--- a/services/mediametrics/main_mediametrics.cpp
+++ b/services/mediametrics/main_mediametrics.cpp
@@ -23,7 +23,7 @@
 #include <binder/IPCThreadState.h>
 #include <binder/IServiceManager.h>
 #include <binder/ProcessState.h>
-#include <media/MediaUtils.h>
+#include <mediautils/LimitProcessMemory.h>
 
 int main(int argc __unused, char **argv __unused)
 {