Merge "MediaMetrics: Move LimitProcessMemory to libmediautils" into rvc-dev

4 years ago · 3c0f2d0400
parent 0bf91a9596 d7e0dd4524
commit 3c0f2d0400
9 changed files with 9 additions and 11 deletions
--- a/media/audioserver/main_audioserver.cpp
+++ b/media/audioserver/main_audioserver.cpp
@ -26,7 +26,7 @@
 #include <binder/ProcessState.h>
 #include <binder/IServiceManager.h>
 #include <hidl/HidlTransportSupport.h>
-#include <media/MediaUtils.h>
+#include <mediautils/LimitProcessMemory.h>
 #include <utils/Log.h>

 // from LOCAL_C_INCLUDES
--- a/media/libmedia/Android.bp
+++ b/media/libmedia/Android.bp
@ -272,7 +272,6 @@ cc_library {
        "IRemoteDisplay.cpp",
        "IRemoteDisplayClient.cpp",
        "IStreamSource.cpp",
-        "MediaUtils.cpp",
        "Metadata.cpp",
        "mediarecorder.cpp",
        "IMediaMetadataRetriever.cpp",
@ -295,7 +294,6 @@ cc_library {
    },

    header_libs: [
-        "bionic_libc_platform_headers",
        "libstagefright_headers",
        "media_ndk_headers",
    ],
@ -334,7 +332,6 @@ cc_library {
    ],

    static_libs: [
-        "libc_malloc_debug_backtrace", // for memory heap analysis
        "resourcemanager_aidl_interface-ndk_platform",
    ],

--- a/media/utils/Android.bp
+++ b/media/utils/Android.bp
@ -19,6 +19,7 @@ cc_library {
        "AImageReaderUtils.cpp",
        "BatteryNotifier.cpp",
        "ISchedulingPolicyService.cpp",
+        "LimitProcessMemory.cpp",
        "MemoryLeakTrackUtil.cpp",
        "ProcessInfo.cpp",
        "SchedulingPolicyService.cpp",
--- a/media/utils/LimitProcessMemory.cpp
+++ b/media/utils/LimitProcessMemory.cpp
@ -23,7 +23,7 @@
 #include <unistd.h>

 #include <bionic/malloc.h>
-#include <media/MediaUtils.h>
+#include <mediautils/LimitProcessMemory.h>

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

--- a/media/utils/include/mediautils/LimitProcessMemory.h
+++ b/media/utils/include/mediautils/LimitProcessMemory.h
@ -14,8 +14,8 @@
 * limitations under the License.
 */

-#ifndef _MEDIA_UTILS_H
-#define _MEDIA_UTILS_H
+#ifndef ANDROID_MEDIAUTILS_LIMIT_PROCESS_MEMORY_H
+#define ANDROID_MEDIAUTILS_LIMIT_PROCESS_MEMORY_H

 namespace android {

@ -32,4 +32,4 @@ void limitProcessMemory(

 }   // namespace android

-#endif  // _MEDIA_UTILS_H
+#endif // ANDROID_MEDIAUTILS_LIMIT_PROCESS_MEMORY_H
--- a/services/mediaextractor/Android.bp
+++ b/services/mediaextractor/Android.bp
@ -29,6 +29,7 @@ cc_binary {
    shared_libs: [
        "libmedia",
        "libmediaextractorservice",
+        "libmediautils",
        "libbinder",
        "libutils",
        "liblog",
--- 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>
--- a/services/mediametrics/Android.bp
+++ b/services/mediametrics/Android.bp
@ -11,7 +11,6 @@ cc_binary {
    shared_libs: [
        "libbinder",
        "liblog",
-        "libmedia", // limitProcessMemory
        "libmediametricsservice",
        "libmediautils",
        "libutils",
--- 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)
 {