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

Commit bca2ff7a authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Make libavservices_minijail vendor_available" am: 81bfa630 am: e8d27a3b 

Change-Id: Ib01577d9ed29ff0ba13681098cf15665322ce5d9
parents 801d72f4 e8d27a3b

services/mediacodec/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -15,10 +15,6 @@ cc_binary { 
    ],



    target: {

        vendor: {

            exclude_shared_libs: ["libavservices_minijail"],

            shared_libs: ["libavservices_minijail_vendor"],

        },

        android: {

            product_variables: {

                malloc_not_svelte: {

services/mediacodec/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ LOCAL_SHARED_LIBRARIES := \ 
    libutils \

    liblog \

    libbase \

    libavservices_minijail_vendor \

    libavservices_minijail \

    libcutils \

    libhidlbase \

    libstagefright_omx \

services/minijail/Android.bp

+5 −1
Original line number Diff line number Diff line
@@ -17,10 +17,14 @@ cc_defaults { 
cc_library_shared {

    name: "libavservices_minijail",

    defaults: ["libavservices_minijail_defaults"],

    vendor_available: true,

    export_include_dirs: ["."],

}



// Small library for media.extractor and media.codec sandboxing.

// By adding "vendor_available: true" to "libavservices_minijail", we don't

// need to have "libavservices_minijail_vendor" any longer.

// "libavservices_minijail_vendor" will be removed, once we replace it with

// "libavservices_minijail" in all vendor modules. (b/146313710)

cc_library_shared {

    name: "libavservices_minijail_vendor",

    vendor: true,