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

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

resolve merge conflicts of 40da4609 to oc-dr1-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I0c4a9e0648674b78391e257f6a94bd1e325e1964
parents 3806ea87 40da4609

libs/binder/Android.bp

+10 −5
Original line number Diff line number Diff line
@@ -16,6 +16,16 @@ cc_library_headers { 
    name: "libbinder_headers",

    export_include_dirs: ["include"],

    vendor_available: true,

    header_libs: [

        "libbase_headers",

        "libcutils_headers",

        "libutils_headers",

    ],

    export_header_lib_headers: [

        "libbase_headers",

        "libcutils_headers",

        "libutils_headers",

    ],

}



cc_library {
@@ -80,11 +90,6 @@ cc_library { 
        "libbinder_headers",

    ],



    export_shared_lib_headers: [

        "libbase",

        "libutils",

    ],



    export_header_lib_headers: [

        "libbinder_headers",

    ],