Merge \"Use the full path to the shared lib.\"

am: c2062f9c44

Change-Id: I45426d5e6aee4f5bc0f5d1fa64704bf5d4526e6e
This commit is contained in:
Dan Albert
2016-07-21 18:54:06 +00:00
committed by android-build-merger

View File

@@ -385,8 +385,7 @@ func TransformObjToDynamicBinary(ctx android.ModuleContext,
if !strings.HasSuffix(file, flags.toolchain.ShlibSuffix()) { if !strings.HasSuffix(file, flags.toolchain.ShlibSuffix()) {
panic("shared library " + lib.String() + " does not end with " + flags.toolchain.ShlibSuffix()) panic("shared library " + lib.String() + " does not end with " + flags.toolchain.ShlibSuffix())
} }
libFlagsList = append(libFlagsList, libFlagsList = append(libFlagsList, lib.String())
"-l"+strings.TrimSuffix(strings.TrimPrefix(file, "lib"), flags.toolchain.ShlibSuffix()))
ldDirs = append(ldDirs, dir) ldDirs = append(ldDirs, dir)
} }