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

Commit 1e00517d authored by Jaesoo Lee's avatar Jaesoo Lee
Browse files

resolve merge conflicts of afc0aa78 to oc-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I0e1cc5f5367c4840eea5f56670f74a44743f1853
parents 552a4c10 afc0aa78

libutils/Android.bp

+8 −2
Original line number Diff line number Diff line
@@ -17,8 +17,14 @@ cc_library_headers { 
    vendor_available: true,

    host_supported: true,



    header_libs: ["libsystem_headers",],

    export_header_lib_headers: ["libsystem_headers",],

    header_libs: [

        "libsystem_headers",

        "libcutils_headers"

    ],

    export_header_lib_headers: [

        "libsystem_headers",

        "libcutils_headers"

    ],

    export_include_dirs: ["include"],



    target: {