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

Commit 7795f5f4 authored by Atneya Nair's avatar Atneya Nair
Browse files

Make mediautils host available 

This allows us to have host-side unit tests.
The existing libmediautils is unchanged, but host available source files
are split into libmediautils_core.

Test: Compiles
Change-Id: I140937cbcd840876c4642b6281fad9e862accdac
parent cb90d203

media/utils/Android.bp

+67 −47
Original line number Diff line number Diff line
@@ -21,23 +21,76 @@ package { 
    default_applicable_licenses: ["frameworks_av_license"],

}



cc_library {

    name: "libmediautils",

cc_defaults {

    name: "libmediautils_defaults",

    cflags: [

        "-Wall",

        "-Werror",

        "-Wextra",

    ],

}



filegroup {

    name: "libmediautils_core_srcs",

    srcs: [

        "AImageReaderUtils.cpp",

        "BatteryNotifier.cpp",

        "ISchedulingPolicyService.cpp",

        "Library.cpp",

        "LimitProcessMemory.cpp",

        "MediaUtilsDelayed.cpp",

        "MemoryLeakTrackUtil.cpp",

        "MethodStatistics.cpp",

        "Process.cpp",

        "ProcessInfo.cpp",

        "SchedulingPolicyService.cpp",

        "ServiceUtilities.cpp",

        "ThreadSnapshot.cpp",

    ],

}



cc_library_headers {

    name: "libmediautils_headers",

    host_supported: true,

    vendor_available: true, // required for platform/hardware/interfaces

    shared_libs: [

        "liblog",

    ],

    local_include_dirs: ["include"],

    export_include_dirs: ["include"],

}



cc_library {

    name: "libmediautils_core",

    defaults: ["libmediautils_defaults"],

    host_supported: true,

    srcs: [":libmediautils_core_srcs"],

    shared_libs: [

        "libaudioutils", // for clock.h, Statistics.h

        "libbase",

        "libbinder",

        "libhidlbase",

        "liblog",

        "libpermission",

        "libutils",

        "android.hardware.graphics.bufferqueue@1.0",

        "android.hidl.token@1.0-utils",

        "packagemanager_aidl-cpp",

    ],



    export_shared_lib_headers: [

        "libpermission",

    ],



    local_include_dirs: ["include"],

    export_include_dirs: ["include"],

}



cc_library {

    name: "libmediautils",

    defaults: ["libmediautils_defaults"],

    srcs: [

        ":libmediautils_core_srcs",

        "BatteryNotifier.cpp",

        "MemoryLeakTrackUtil.cpp",

        "LimitProcessMemory.cpp",

        "ProcessInfo.cpp",

        "ServiceUtilities.cpp",

        "TimeCheck.cpp",

        "TimerThread.cpp",

    ],
@@ -49,12 +102,13 @@ cc_library { 
    shared_libs: [

        "libaudioclient_aidl_conversion",

        "libaudioutils", // for clock.h, Statistics.h

        "libbase",

        "libbinder",

        "libcutils",

        "liblog",

        "libutils",

        "libhidlbase",

        "liblog",

        "libpermission",

        "libutils",

        "android.hardware.graphics.bufferqueue@1.0",

        "android.hidl.token@1.0-utils",

        "packagemanager_aidl-cpp",
@@ -65,12 +119,6 @@ cc_library { 


    logtags: ["EventLogTags.logtags"],



    cflags: [

        "-Wall",

        "-Wextra",

        "-Werror",

    ],



    header_libs: [

        "bionic_libc_platform_headers",

        "libmedia_headers",
@@ -94,14 +142,10 @@ cc_library { 


cc_library {

    name: "libmediautils_delayed", // match with MEDIAUTILS_DELAYED_LIBRARY_NAME

    defaults: ["libmediautils_defaults"],

    srcs: [

        "MediaUtilsDelayedLibrary.cpp",

    ],

    cflags: [

        "-Wall",

        "-Werror",

        "-Wextra",

    ],

    shared_libs: [

        "liblog",

        "libutils",
@@ -111,16 +155,12 @@ cc_library { 


cc_library {

    name: "libmediautils_vendor",

    defaults: ["libmediautils_defaults"],

    vendor_available: true, // required for platform/hardware/interfaces

    srcs: [

        "MemoryLeakTrackUtil.cpp",

    ],



    cflags: [

        "-Wall",

        "-Wextra",

        "-Werror",

    ],

    shared_libs: [

        "liblog",

        "libutils",
@@ -137,23 +177,3 @@ cc_library { 
    local_include_dirs: ["include"],

    export_include_dirs: ["include"],

}
 




cc_library_headers {

    name: "libmediautils_headers",

    vendor_available: true,  // required for platform/hardware/interfaces



    export_include_dirs: ["include"],

}



cc_test {

    name: "libmediautils_test",

    srcs: [

        "memory-test.cpp",

        "TimerThread-test.cpp",

    ],

    shared_libs: [

      "libmediautils",

      "libutils",

    ]

}

media/utils/fuzzers/Android.bp

+11 −9
Original line number Diff line number Diff line
@@ -9,14 +9,13 @@ package { 


cc_defaults {

    name: "libmediautils_fuzzer_defaults",

    host_supported: true,

    shared_libs: [

        "libbatterystats_aidl",

        "libbinder",

        "libcutils",

        "liblog",

        "libmediautils",

        "libcutils",

        "libmediautils_core",

        "libutils",

        "libbinder",

        "framework-permission-aidl-cpp",

        "packagemanager_aidl-cpp",

    ],
@@ -27,33 +26,36 @@ cc_defaults { 
        "-Werror",

        "-Wno-c++2a-extensions",

    ],



    header_libs: [

        "bionic_libc_platform_headers",

        "libmedia_headers",

    ],

}



cc_fuzz {

    name: "libmediautils_fuzzer_battery_notifier",

    host_supported: false,

    shared_libs: ["libmediautils"],

    defaults: ["libmediautils_fuzzer_defaults"],

    srcs: ["BatteryNotifierFuzz.cpp"],

}



cc_fuzz {

    name: "libmediautils_fuzzer_scheduling_policy_service",

    host_supported: false,

    shared_libs: ["libmediautils"],

    defaults: ["libmediautils_fuzzer_defaults"],

    srcs: ["SchedulingPolicyServiceFuzz.cpp"],

}



cc_fuzz {

    name: "libmediautils_fuzzer_service_utilities",

    host_supported: false,

    shared_libs: ["libmediautils"],

    defaults: ["libmediautils_fuzzer_defaults"],

    srcs: ["ServiceUtilitiesFuzz.cpp"],

}



cc_fuzz {

    name: "libmediautils_fuzzer_time_check",

    host_supported: false,

    shared_libs: ["libmediautils"],

    defaults: ["libmediautils_fuzzer_defaults"],

    srcs: ["TimeCheckFuzz.cpp"],

}

media/utils/include/mediautils/ServiceUtilities.h

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ private: 
    std::optional<bool> doIsAllowed(uid_t uid);

    sp<content::pm::IPackageManagerNative> retrievePackageManager();

    sp<content::pm::IPackageManagerNative> mPackageManager; // To check apps manifest

    uint_t mPackageManagerErrors = 0;

    unsigned int mPackageManagerErrors = 0;

    struct Package {

        std::string name;

        bool playbackCaptureAllowed = false;

media/utils/tests/Android.bp

+49 −102
Original line number Diff line number Diff line
@@ -7,8 +7,11 @@ package { 
    default_applicable_licenses: ["frameworks_av_license"],

}



cc_test_library {

    name: "libsharedtest",

cc_defaults {

    name: "libmediautils_tests_defaults",



    host_supported: true,



    cflags: [

        "-Wall",

        "-Werror",
@@ -24,8 +27,29 @@ cc_test_library { 


    shared_libs: [

        "liblog",

        "libmediautils_core",

        "libutils",

    ],



}



cc_defaults {

    name: "libmediautils_tests_host_unavail",



    defaults: ["libmediautils_tests_defaults"],



    host_supported: false,



    shared_libs: [

        "libmediautils",

    ],

}



cc_test_library {

    name: "libsharedtest",



    defaults: ["libmediautils_tests_defaults"],



    srcs: [

        "sharedtest.cpp",

    ],
@@ -34,28 +58,14 @@ cc_test_library { 
cc_test {

    name: "library_tests",



    cflags: [

        "-Wall",

        "-Werror",

        "-Wextra",

    ],

    defaults: ["libmediautils_tests_defaults"],



    sanitize: {

        address: true,

        cfi: true,

        integer_overflow: true,

        memtag_heap: true,

    },

    data_libs: [

        "libsharedtest",

    ],



    shared_libs: [

        "libbase",

        "liblog",

        "libmediautils",

        "libutils",

    ],



    data_libs: [

        "libsharedtest",

    ],



    srcs: [
@@ -64,39 +74,34 @@ cc_test { 
}



cc_test {

    name: "media_process_tests",

    name: "libmediautils_test",



    cflags: [

        "-Wall",

        "-Werror",

        "-Wextra",

    ],

    defaults: ["libmediautils_tests_host_unavail"],



    shared_libs: [

        "liblog",

        "libmediautils",

        "libutils",

    ],



    srcs: [

        "media_process_tests.cpp",

        "memory-test.cpp",

        "TimerThread-test.cpp",

    ],

}



cc_test {

    name: "media_synchronization_tests",

    name: "media_process_tests",



    cflags: [

        "-Wall",

        "-Werror",

        "-Wextra",

    ],

    defaults: ["libmediautils_tests_host_unavail"],



    shared_libs: [

        "liblog",

        "libmediautils",

        "libutils",

    srcs: [

        "media_process_tests.cpp",

    ],

}



cc_test {

    name: "media_synchronization_tests",



    defaults: ["libmediautils_tests_host_unavail"],



    srcs: [

        "media_synchronization_tests.cpp",
@@ -106,17 +111,7 @@ cc_test { 
cc_test {

    name: "media_threadsnapshot_tests",



    cflags: [

        "-Wall",

        "-Werror",

        "-Wextra",

    ],



    shared_libs: [

        "liblog",

        "libmediautils",

        "libutils",

    ],

    defaults: ["libmediautils_tests_host_unavail"],



    srcs: [

        "media_threadsnapshot_tests.cpp",
@@ -126,17 +121,10 @@ cc_test { 
cc_test {

    name: "mediautils_scopedstatistics_tests",



    cflags: [

        "-Wall",

        "-Werror",

        "-Wextra",

    ],

    defaults: ["libmediautils_tests_defaults"],



    shared_libs: [

        "libaudioutils",

        "liblog",

        "libmediautils",

        "libutils",

    ],



    srcs: [
@@ -147,17 +135,10 @@ cc_test { 
cc_test {

    name: "methodstatistics_tests",



    cflags: [

        "-Wall",

        "-Werror",

        "-Wextra",

    ],

    defaults: ["libmediautils_tests_defaults"],



    shared_libs: [

        "libaudioutils",

        "liblog",

        "libmediautils",

        "libutils",

    ],



    srcs: [
@@ -168,24 +149,7 @@ cc_test { 
cc_test {

    name: "timecheck_tests",



    cflags: [

        "-Wall",

        "-Werror",

        "-Wextra",

    ],



    sanitize: {

        address: true,

        cfi: true,

        integer_overflow: true,

        memtag_heap: true,

    },



    shared_libs: [

        "liblog",

        "libmediautils",

        "libutils",

    ],

    defaults: ["libmediautils_tests_host_unavail"],



    srcs: [

        "timecheck_tests.cpp",
@@ -194,25 +158,8 @@ cc_test { 


cc_test {

    name: "extended_accumulator_tests",

    cflags: [

        "-Wall",

        "-Werror",

        "-Wextra",

    ],



    sanitize: {

        address: true,

        cfi: true,

        integer_overflow: true,

        memtag_heap: true,

    },



    shared_libs: [

        "libbase",

        "liblog",

        "libmediautils",

        "libutils",

    ],

    defaults: ["libmediautils_tests_defaults"],



    srcs: [

        "extended_accumulator_tests.cpp",