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

Commit 3c0f2d04 authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

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

parents 0bf91a95 d7e0dd45

media/audioserver/main_audioserver.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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

media/libmedia/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -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",

    ],

media/utils/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ cc_library { 
        "AImageReaderUtils.cpp",

        "BatteryNotifier.cpp",

        "ISchedulingPolicyService.cpp",

        "LimitProcessMemory.cpp",

        "MemoryLeakTrackUtil.cpp",

        "ProcessInfo.cpp",

        "SchedulingPolicyService.cpp",

media/libmedia/MediaUtils.cpp→media/utils/LimitProcessMemory.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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));

media/libmedia/include/media/MediaUtils.h→media/utils/include/mediautils/LimitProcessMemory.h

+3 −3
Original line number Diff line number Diff line
@@ -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