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

Commit 22c2202e authored by Hridya Valsaraju's avatar Hridya Valsaraju
Browse files

Revert "Use more shared libraries in adb and init." 

This reverts commit fbd79687.

Reason for revert: b/111734137

Change-Id: I70e23ed20d16821a555b448d4ac76fe9e130afa5
parent fbd79687

adb/Android.bp

+24 −29
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ cc_binary_host { 
    },

}



cc_library {

cc_library_static {

    name: "libadbd",

    defaults: ["adb_defaults"],

    recovery_available: true,
@@ -288,36 +288,16 @@ cc_library { 
        "daemon/auth.cpp",

        "daemon/usb.cpp",

        "daemon/jdwp_service.cpp",

        "daemon/mdns.cpp",

        "daemon/file_sync_service.cpp",

        "daemon/framebuffer_service.cpp",

        "daemon/remount_service.cpp",

        "daemon/set_verity_enable_state_service.cpp",

        "daemon/shell_service.cpp",

        "shell_service_protocol.cpp",

    ],



    static_libs: [

        "libavb_user",

        "libdiagnose_usb",

        "libfec",

        "libfec_rs",

        "libfs_mgr",

        "libmdnssd",

        "libqemu_pipe",

        "libsquashfs_utils",

        "libselinux",

    ],



    shared_libs: [

        "libasyncio",

        "libbootloader_message",

        "libbase",

        "libcrypto_utils",

        "libcrypto",

        "libcutils",

        "libext4_utils",

        "liblog",

        "libdiagnose_usb",

        "libqemu_pipe",

        "libbase",

    ],



    export_include_dirs: [
@@ -333,6 +313,13 @@ cc_binary { 


    srcs: [

        "daemon/main.cpp",

        "daemon/mdns.cpp",

        "daemon/file_sync_service.cpp",

        "daemon/framebuffer_service.cpp",

        "daemon/remount_service.cpp",

        "daemon/set_verity_enable_state_service.cpp",

        "daemon/shell_service.cpp",

        "shell_service_protocol.cpp",

    ],



    cflags: [
@@ -344,19 +331,27 @@ cc_binary { 
        keep_symbols: true,

    },



    shared_libs: [

    static_libs: [

        "libadbd",

        "libasyncio",

        "libbase",

        "libavb_user",

        "libbootloader_message",

        "libcap",

        "libcrypto_utils",

        "libcrypto",

        "libcutils",

        "libext4_utils",

        "libdiagnose_usb",

        "libfec",

        "libfec_rs",

        "libfs_mgr",

        "liblog",

        "libext4_utils",

        "libmdnssd",

        "libminijail",

        "libselinux",

        "libsquashfs_utils",

        "libqemu_pipe",



        "libbase",

        "libcutils",

    ],

}

adb/transport_local.cpp

+4 −4
Original line number Diff line number Diff line
@@ -428,10 +428,6 @@ void local_init(int port) 
    std::thread(func, port).detach();

}



std::string getEmulatorSerialString(int console_port) {

    return android::base::StringPrintf("emulator-%d", console_port);

}



#if ADB_HOST

struct EmulatorConnection : public FdConnection {

    EmulatorConnection(unique_fd fd, int local_port)
@@ -466,6 +462,10 @@ static atransport* find_emulator_transport_by_adb_port_locked(int adb_port) 
    return it->second;

}



std::string getEmulatorSerialString(int console_port) {

    return android::base::StringPrintf("emulator-%d", console_port);

}



atransport* find_emulator_transport_by_adb_port(int adb_port) {

    std::lock_guard<std::mutex> lock(local_transports_lock);

    return find_emulator_transport_by_adb_port_locked(adb_port);

fs_mgr/Android.bp

+7 −14
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ cc_defaults { 
    ],

}



cc_library {

cc_library_static {

    name: "libfs_mgr",

    defaults: ["fs_mgr_defaults"],

    recovery_available: true,
@@ -44,24 +44,18 @@ cc_library { 
        "fs_mgr_avb_ops.cpp",

        "fs_mgr_dm_linear.cpp",

    ],

    shared_libs: [

    static_libs: [

        "libfec",

        "libfec_rs",

        "libbase",

        "libcrypto_utils",

        "libcrypto",

        "libcutils",

        "libext4_utils",

        "libkeyutils",

        "liblog",

        "liblogwrap",

        "libsquashfs_utils",

        "libselinux",

    ],

    static_libs: [

        "libavb",

        "libdm",

        "libfstab",

        "libdm",

        "liblp",

    ],

    export_static_lib_headers: [
@@ -71,8 +65,9 @@ cc_library { 
    ],

    whole_static_libs: [

        "liblp",

        "libfstab",

        "liblogwrap",

        "libdm",

        "libfstab",

    ],

    cppflags: [

        "-DALLOW_ADBD_DISABLE_VERITY=0",
@@ -87,7 +82,7 @@ cc_library { 
    },

}



cc_library {

cc_library_static {

    name: "libfstab",

    vendor_available: true,

    recovery_available: true,
@@ -98,7 +93,5 @@ cc_library { 
        "fs_mgr_slotselect.cpp",

    ],

    export_include_dirs: ["include_fstab"],

    shared_libs: [

        "libbase",

    ],

    header_libs: ["libbase_headers"],

}

fs_mgr/libdm/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
// limitations under the License.

//



cc_library {

cc_library_static {

    name: "libdm",

    defaults: ["fs_mgr_defaults"],

    recovery_available: true,
@@ -32,9 +32,9 @@ cc_library { 
        "loop_control.cpp",

    ],



    shared_libs: [

        "libbase",

        "liblog",

    header_libs: [

        "libbase_headers",

        "liblog_headers",

    ],

}

init/Android.bp

+8 −9
Original line number Diff line number Diff line
@@ -59,9 +59,17 @@ cc_defaults { 
        },

    },

    static_libs: [

        "libbootloader_message",

        "libfs_mgr",

        "libfec",

        "libfec_rs",

        "libhidl-gen-utils",

        "libsquashfs_utils",

        "liblogwrap",

        "libext4_utils",

        "libseccomp_policy",

        "libcrypto_utils",

        "libsparse",

        "libprocessgroup",

        "libavb",

        "libkeyutils",
@@ -70,22 +78,13 @@ cc_defaults { 
        "libpropertyinfoparser",

    ],

    shared_libs: [

        "libbootloader_message",

        "libcrypto_utils",

        "libcutils",

        "libbase",

        "libc",

        "libext4_utils",

        "libfs_mgr",

        "libfec",

        "libfec_rs",

        "liblog",

        "liblogwrap",

        "libcrypto",

        "libc++",

        "libdl",

        "libselinux",

        "libsparse",

        "libz",

        "libselinux",

    ],