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

Commit 259775cf authored by Jiyong Park's avatar Jiyong Park
Browse files

merge dumpstate_headers into libdumpstateutil 

The header lib is used nowhere outside of this .bp.

Test: build with aosp_arm64_ab
Change-Id: I082e9bb7139051cb47b76e411f86d54ed89b6fbc
parent dc3cb642

cmds/dumpstate/Android.bp

+4 −18
Original line number Diff line number Diff line
@@ -24,20 +24,6 @@ cc_defaults { 
    ],

}



cc_library_headers {

    name: "dumpstate_headers",

    vendor_available: true,

    export_include_dirs: ["."],

    header_libs: [

        "libbase_headers",

        "libutils_headers",

    ],

    export_header_lib_headers: [

        "libbase_headers",

        "libutils_headers",

    ],

}



cc_library_shared {

    name: "libdumpstateutil",

    defaults: ["dumpstate_defaults"],
@@ -45,8 +31,6 @@ cc_library_shared { 
    vndk: {

        enabled: true,

    },

    header_libs: ["dumpstate_headers"],

    export_header_lib_headers: ["dumpstate_headers"],

    srcs: [

        "DumpstateInternal.cpp",

        "DumpstateUtil.cpp",
@@ -55,6 +39,10 @@ cc_library_shared { 
        "libbase",

        "liblog",

    ],

    export_include_dirs: ["."],

    export_shared_lib_headers: [

        "libbase",

    ],

}



cc_library_shared {
@@ -78,7 +66,6 @@ cc_library_shared { 
cc_binary {

    name: "dumpstate",

    defaults: ["dumpstate_defaults"],

    header_libs: ["dumpstate_headers"],

    shared_libs: [

        "android.hardware.dumpstate@1.0",

        "libziparchive",
@@ -106,7 +93,6 @@ cc_binary { 
cc_test {

    name: "dumpstate_test",

    defaults: ["dumpstate_defaults"],

    header_libs: ["dumpstate_headers"],

    shared_libs: [

        "libziparchive",

        "libbase",