diff options
| author | JP Abgrall <jpa@google.com> | 2014-06-19 14:47:19 -0700 |
|---|---|---|
| committer | JP Abgrall <jpa@google.com> | 2014-06-19 14:47:19 -0700 |
| commit | 436abebf8c7df9e528e534b3c8dab955449c055b (patch) | |
| tree | c90e771ac0b6e61d575c90df16d1a3e6d9789cbb /fastboot | |
| parent | ec249c84ba526c27e75caf5d289f01aabb683d8b (diff) | |
| download | system_core-436abebf8c7df9e528e534b3c8dab955449c055b.zip system_core-436abebf8c7df9e528e534b3c8dab955449c055b.tar.gz system_core-436abebf8c7df9e528e534b3c8dab955449c055b.tar.bz2 | |
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 <jpa@google.com>
Diffstat (limited to 'fastboot')
| -rw-r--r-- | fastboot/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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. |