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

Commit 1528f3dd authored by Ray Essick's avatar Ray Essick Committed by Automerger Merge Worker
Browse files

Merge "libmediaplayerservice: Build both shared and static libraries" am:... 

Merge "libmediaplayerservice: Build both shared and static libraries" am: d62dda99 am: 13d1aaea am: 08d87938

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1576079

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a6af6e1f2af97c8008e1f89b95ff88c7e6cfdd5
parents c4d71301 08d87938

media/libmediaplayerservice/Android.bp

+1 −1
Original line number Diff line number Diff line 
cc_library_shared {

cc_library {



    srcs: [

        "ActivityManager.cpp",

media/libmediaplayerservice/tests/stagefrightRecorder/Android.bp

+32 −11
Original line number Diff line number Diff line
@@ -23,26 +23,47 @@ cc_test { 
    ],



    include_dirs: [

        "system/media/audio/include",

        "frameworks/av/include",

        "frameworks/av/camera/include",

        "frameworks/av/media/libmediaplayerservice",

        "frameworks/av/media/libmediametrics/include",

        "frameworks/av/media/ndk/include",

    ],



    static_libs: [

        "libmediaplayerservice",

        "libstagefright_httplive",

        "libstagefright_rtsp",

    ],



    shared_libs: [

        "android.hardware.media.c2@1.0",

        "android.hardware.media.omx@1.0",

        "libbase",

        "libandroid_net",

        "libaudioclient",

        "libbinder",

        "libcamera_client",

        "libcodec2_client",

        "libcrypto",

        "libcutils",

        "libdatasource",

        "libdl",

        "libdrmframework",

        "libgui",

        "libhidlbase",

        "liblog",

        "libmedia",

        "libbinder",

        "libutils",

        "libmediaplayerservice",

        "libstagefright",

        "libmedia_codeclist",

        "libmedia_omx",

        "libmediadrm",

        "libmediandk",

        "libmediametrics",

        "libmediautils",

        "libmemunreachable",

        "libnetd_client",

        "libpowermanager",

        "libstagefright",

        "libstagefright_foundation",

        "libutils",

    ],



    compile_multilib: "prefer32",



    cflags: [

        "-Werror",

        "-Wall",