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

Commit b3358a7f authored by Jiyong Park's avatar Jiyong Park
Browse files

resolve merge conflicts of 1ec43c9c to pi-dev-plus-aosp 

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia022f34c839539aab4a18ca331f22165d1abfaff
parents f4f01aaf 1ec43c9c

media/libmedia/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ cc_library_shared { 
    vndk: {

        enabled: true,

    },

    double_loadable: true,



    srcs: [

        "aidl/android/IGraphicBufferSource.aidl",

media/libstagefright/foundation/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ cc_library { 
    vndk: {

        enabled: true,

    },

    double_loadable: true,

    include_dirs: [

        "frameworks/av/include",

        "frameworks/native/include",