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

Commit 36fb6756 authored by Josh Gao's avatar Josh Gao
Browse files

Statically link libadbd into minadbd. 

Bug: http://b/150317254
Test: booted aosp_walleye-eng into recovery
Change-Id: Ie479ae2fbaf1006228a531dab26c7d535ed403db
Merged-In: Ie479ae2fbaf1006228a531dab26c7d535ed403db
(cherry picked from commit 3735614b)
parent 2b5fa550

adb/Android.bp

+56 −38
Original line number Diff line number Diff line
@@ -114,6 +114,44 @@ cc_defaults { 
    },

}



cc_defaults {

    name: "libadbd_binary_dependencies",

    static_libs: [

        "libadb_crypto",

        "libadb_pairing_connection",

        "libadb_tls_connection",

        "libadbd",

        "libadbd_core",

        "libadbconnection_server",

        "libasyncio",

        "libbrotli",

        "libcutils_sockets",

        "libdiagnose_usb",

        "libmdnssd",

        "libbase",



        "libadb_protos",

    ],



    shared_libs: [

        "libadbd_auth",

        "libadbd_fs",

        "libcrypto",

        "libcrypto_utils",

        "liblog",

        "libselinux",

    ],



    target: {

        recovery: {

            exclude_static_libs: [

                "libadb_pairing_auth",

                "libadb_pairing_connection",

            ],

        },

    },

}



// libadb

// =========================================================

// These files are compiled for both the host and the device.
@@ -365,6 +403,7 @@ cc_library_static { 
        "libbase",

        "libcrypto",

        "libcrypto_utils",

        "libcutils_sockets",

        "liblog",

    ],
@@ -418,13 +457,15 @@ cc_library { 
        "libadb_pairing_connection",

        "libadb_protos",

        "libadb_tls_connection",

        "libadbd_auth",

        "libadbd_fs",

        "libasyncio",

        "libbase",

        "libcrypto",

        "libcrypto_utils",

        "libcutils_sockets",



        // APEX dependencies.

        "libadbd_auth",

        "libadbd_fs",

        "libcrypto",

        "liblog",

    ],
@@ -464,25 +505,21 @@ cc_library { 
    // libminadbd wants both, as it's used to build native tests.

    compile_multilib: "both",



    // libadbd doesn't build any additional source, but to expose libadbd_core as a shared library.

    whole_static_libs: [

        "libadbconnection_server",

        "libadbd_core",

    ],



    shared_libs: [

        "libadb_crypto",

        "libadb_pairing_connection",

        "libadb_tls_connection",

        "libadbd_auth",

        "libadbd_fs",

        "libadbd_services",

        "libasyncio",

        "libbase",

        "libcrypto",

        "libcrypto_utils",

        "liblog",

        "libselinux",



        // APEX dependencies on the system image.

        "libadbd_auth",

        "libadbd_fs",

        "libadbd_services",

    ],



    target: {
@@ -495,6 +532,7 @@ cc_library { 
    },



    static_libs: [

        "libadbd_core",

        "libbrotli",

        "libcutils_sockets",

        "libdiagnose_usb",
@@ -509,7 +547,7 @@ cc_library { 


cc_binary {

    name: "adbd",

    defaults: ["adbd_defaults", "host_adbd_supported"],

    defaults: ["adbd_defaults", "host_adbd_supported", "libadbd_binary_dependencies"],

    stl: "libc++_static",

    recovery_available: true,
@@ -527,31 +565,17 @@ cc_binary { 
    },



    static_libs: [

        "libadb_crypto",

        "libadb_tls_connection",

        "libadbconnection_server",

        "libadbd",

        "libadbd_services",

        "libasyncio",

        "libbase",

        "libbrotli",

        "libcap",

        "libcrypto_utils",

        "libcutils_sockets",

        "libdiagnose_usb",

        "libmdnssd",

        "libminijail",

        "libssl",

    ],



    shared_libs: [

        "libadb_pairing_connection",

        "libadb_protos",

        "libadbd_auth",

        "libadbd_fs",

        "libcrypto",

        "liblog",

        "libselinux",

    ],



    target: {
@@ -623,8 +647,7 @@ cc_binary { 
cc_test {

    name: "adbd_test",



    defaults: ["adbd_defaults"],

    stl: "libc++_static",

    defaults: ["adbd_defaults", "libadbd_binary_dependencies"],



    recovery_available: false,

    srcs: libadb_test_srcs + [
@@ -635,21 +658,16 @@ cc_test { 
        "shell_service_protocol_test.cpp",

    ],



    shared_libs: [

        "liblog",

    ],



    static_libs: [

        "libadbd",

        "libadbd_auth",

        "libadb_crypto_static",

        "libadb_pairing_connection_static",

        "libadb_tls_connection_static",

        "libbase",

        "libcrypto_utils",

        "libcrypto_static",

        "libcutils_sockets",

        "libdiagnose_usb",

        "liblog",

        "libusb",

        "libmdnssd",

        "libselinux",

    ],

    test_suites: ["device-tests", "mts"],

    require_root: true,

adb/crypto/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ cc_defaults { 


    visibility: [

        "//system/core/adb:__subpackages__",

        "//bootable/recovery/minadbd:__subpackages__",

    ],



    host_supported: true,

adb/pairing_connection/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ cc_defaults { 
        "//art:__subpackages__",

        "//system/core/adb:__subpackages__",

        "//frameworks/base/services:__subpackages__",



        // This needs to be visible to minadbd, even though it's removed via exclude_shared_libs.

        "//bootable/recovery/minadbd:__subpackages__",

    ],

    apex_available: [

        "com.android.adbd",

adb/proto/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ cc_defaults { 


    visibility: [

        "//system/core/adb:__subpackages__",



        // This needs to be visible to minadbd, even though it's removed via exclude_shared_libs.

        "//bootable/recovery/minadbd:__subpackages__",

    ],



    stl: "libc++_static",

adb/tls/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ cc_defaults { 
    recovery_available: true,



    visibility: [

        "//bootable/recovery/minadbd:__subpackages__",

        "//system/core/adb:__subpackages__",

    ],