From 436abebf8c7df9e528e534b3c8dab955449c055b Mon Sep 17 00:00:00 2001 From: JP Abgrall Date: Thu, 19 Jun 2014 14:47:19 -0700 Subject: fastboot: Allow searching for needed dynamic libs in '.' (F2FS) Currently the default rpath includes $ORIGIN/../lib So we throw in '.' which should help distributions of fastboot. readelf -d $(which fastboot)|grep RPATH 0x0000000f (RPATH) Library rpath: [$ORIGIN/../lib:.] Bug: 15731906 Change-Id: I2f4345d178e5b3c87f6f159faf105ae30f3b52eb Signed-off-by: JP Abgrall --- fastboot/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'fastboot') diff --git a/fastboot/Android.mk b/fastboot/Android.mk index 0238404..08854cf 100644 --- a/fastboot/Android.mk +++ b/fastboot/Android.mk @@ -66,7 +66,7 @@ endif # HOST_OS != windows ifeq ($(HOST_OS),linux) # libf2fs_dlutils_host will dlopen("libf2fs_fmt_host_dyn") LOCAL_CFLAGS += -DUSE_F2FS -LOCAL_LDFLAGS += -ldl -rdynamic +LOCAL_LDFLAGS += -ldl -rdynamic -Wl,-rpath,. 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. -- cgit v1.1