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

Commit ad9d034e authored by Joshua Duong's avatar Joshua Duong Committed by Gerrit Code Review
Browse files

Merge "Remove pairing_auth, pairing_connection from recovery."

parents 14c65f6f 0f53d179

adb/Android.bp

+30 −2
Original line number Diff line number Diff line
@@ -419,6 +419,12 @@ cc_library_static { 
            srcs: [

                "daemon/usb_dummy.cpp",

            ]

        },

        recovery: {

            exclude_shared_libs: [

                "libadb_pairing_auth",

                "libadb_pairing_connection",

            ],

        }

    },

}
@@ -478,6 +484,10 @@ cc_library_static { 
            exclude_srcs: [

                "daemon/abb_service.cpp",

            ],

            exclude_shared_libs: [

                "libadb_pairing_auth",

                "libadb_pairing_connection",

            ],

        },

    },

}
@@ -513,6 +523,15 @@ cc_library { 
        "libselinux",

    ],



    target: {

        recovery: {

            exclude_shared_libs: [

                "libadb_pairing_auth",

                "libadb_pairing_connection",

            ],

        }

    },



    static_libs: [

        "libadbd_services",

        "libcutils_sockets",
@@ -545,6 +564,8 @@ cc_binary { 
    },



    static_libs: [

        "libadb_crypto",

        "libadb_tls_connection",

        "libadbconnection_server",

        "libadbd",

        "libadbd_services",
@@ -562,15 +583,22 @@ cc_binary { 
    ],



    shared_libs: [

        "libadb_crypto",

        "libadb_pairing_connection",

        "libadb_protos",

        "libadb_tls_connection",

        "libadbd_auth",

        "libadbd_fs",

        "libcrypto",

    ],



    target: {

        recovery: {

            exclude_shared_libs: [

                "libadb_pairing_auth",

                "libadb_pairing_connection",

            ],

        }

    },



    required: [

        "libadbd_auth",

        "libadbd_fs",

adb/crypto/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -45,8 +45,6 @@ cc_defaults { 
    host_supported: true,

    recovery_available: true,



    stl: "libc++_static",



    shared_libs: [

        "libadb_protos",

        "libbase",

adb/pairing_auth/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ cc_defaults { 
    use_version_lib: false,



    host_supported: true,

    recovery_available: true,

    recovery_available: false,



    stl: "libc++_static",

adb/pairing_connection/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ cc_defaults { 
    stl: "libc++_static",



    host_supported: true,

    recovery_available: true,

    recovery_available: false,



    static_libs: [

        "libbase",
@@ -131,7 +131,7 @@ cc_defaults { 
    ],



    host_supported: true,

    recovery_available: true,

    recovery_available: false,



    stl: "libc++_static",

adb/tls/Android.bp

+1 −5
Original line number Diff line number Diff line
@@ -42,12 +42,8 @@ cc_defaults { 
        "//system/core/adb:__subpackages__",

    ],



    stl: "libc++_static",



    static_libs: [

        "libbase",

    ],

    shared_libs: [

        "libbase",

        "libcrypto",

        "liblog",

        "libssl",