diff options
| author | JP Abgrall <jpa@google.com> | 2014-06-18 11:12:52 -0700 |
|---|---|---|
| committer | JP Abgrall <jpa@google.com> | 2014-06-18 11:13:05 -0700 |
| commit | 64c0ff21e484331bcd796284bc16160ab04f53e2 (patch) | |
| tree | d79851cf93142d15d1c334b7dc958a1ebff57bf3 /fastboot/Android.mk | |
| parent | 11d8ac2afb48aad2ae4e71042107f7d79a15c5c4 (diff) | |
| download | system_core-64c0ff21e484331bcd796284bc16160ab04f53e2.zip system_core-64c0ff21e484331bcd796284bc16160ab04f53e2.tar.gz system_core-64c0ff21e484331bcd796284bc16160ab04f53e2.tar.bz2 | |
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: JP Abgrall <jpa@google.com>
Diffstat (limited to 'fastboot/Android.mk')
| -rw-r--r-- | fastboot/Android.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fastboot/Android.mk b/fastboot/Android.mk index 5a651f4..0238404 100644 --- a/fastboot/Android.mk +++ b/fastboot/Android.mk @@ -66,11 +66,11 @@ endif # HOST_OS != windows ifeq ($(HOST_OS),linux) # libf2fs_dlutils_host will dlopen("libf2fs_fmt_host_dyn") LOCAL_CFLAGS += -DUSE_F2FS -LOCAL_LDLIBS += -ldl -LOCAL_SHARED_LIBRARIES := libf2fs_fmt_host_dyn +LOCAL_LDFLAGS += -ldl -rdynamic +LOCAL_REQUIRED_MODULES := libf2fs_fmt_host_dyn # The following libf2fs_* are from system/extras/f2fs_utils, # 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 include $(BUILD_HOST_EXECUTABLE) |