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

Commit 64c0ff21 authored by JP Abgrall's avatar JP Abgrall
Browse files

fastboot: correctly set dependency on f2fs dynamic lib 



In the past it would incorrectly also link against the dlopen()'d lib.

Now it clearly does not care about it.

ldd $(which fastboot)
        linux-gate.so.1 =>  (0xf7735000)
        libdl.so.2 => /lib/i386-linux-gnu/libdl.so.2 (0xf76d9000)
        libstdc++.so.6 => /usr/lib/i386-linux-gnu/libstdc++.so.6 (0xf75f4000)
        libm.so.6 => /lib/i386-linux-gnu/libm.so.6 (0xf75c7000)
        libgcc_s.so.1 => /lib/i386-linux-gnu/libgcc_s.so.1 (0xf75a9000)
        libc.so.6 => /lib/i386-linux-gnu/libc.so.6 (0xf73ff000)
        /lib/ld-linux.so.2 (0xf7736000)

Bug: 15717498
Change-Id: I5465e97a445b17f5493a1f590e181ef98a382451
Signed-off-by: default avatarJP Abgrall <jpa@google.com>
parent 11d8ac2a

fastboot/Android.mk

+3 −3
Original line number Original line Diff line number Diff line
@@ -66,11 +66,11 @@ endif # HOST_OS != windows 
ifeq ($(HOST_OS),linux)

ifeq ($(HOST_OS),linux)

# libf2fs_dlutils_host will dlopen("libf2fs_fmt_host_dyn")

# libf2fs_dlutils_host will dlopen("libf2fs_fmt_host_dyn")

LOCAL_CFLAGS += -DUSE_F2FS

LOCAL_CFLAGS += -DUSE_F2FS

LOCAL_LDLIBS += -ldl

LOCAL_LDFLAGS += -ldl -rdynamic

LOCAL_SHARED_LIBRARIES := libf2fs_fmt_host_dyn

LOCAL_REQUIRED_MODULES := libf2fs_fmt_host_dyn

# The following libf2fs_* are from system/extras/f2fs_utils,

# The following libf2fs_* are from system/extras/f2fs_utils,

# and do not use code in external/f2fs-tools.

# and do not use code in external/f2fs-tools.

LOCAL_STATIC_LIBRARIES += libf2fs_utils_host libf2fs_dlutils_host

LOCAL_STATIC_LIBRARIES += libf2fs_utils_host libf2fs_ioutils_host libf2fs_dlutils_host

endif

endif





include $(BUILD_HOST_EXECUTABLE)

include $(BUILD_HOST_EXECUTABLE)