aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2016-07-21 18:45:19 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-07-21 18:45:19 +0000
commitc2062f9c440963936944e9cb8a89a01968fc7bdf (patch)
treedb6955651dfe85257c5f13178749d7865427806c
parent1a0c76fd1e188aace88ac0e9d031e8a85a215711 (diff)
parent9840e1bf1a963df347d30ebf4b2b7bc835c5c7d2 (diff)
downloadbuild_soong-c2062f9c440963936944e9cb8a89a01968fc7bdf.tar.gz
build_soong-c2062f9c440963936944e9cb8a89a01968fc7bdf.tar.bz2
build_soong-c2062f9c440963936944e9cb8a89a01968fc7bdf.zip
Merge "Use the full path to the shared lib."
-rw-r--r--cc/builder.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/cc/builder.go b/cc/builder.go
index 49f88710..0787847f 100644
--- a/cc/builder.go
+++ b/cc/builder.go
@@ -385,8 +385,7 @@ func TransformObjToDynamicBinary(ctx android.ModuleContext,
if !strings.HasSuffix(file, flags.toolchain.ShlibSuffix()) {
panic("shared library " + lib.String() + " does not end with " + flags.toolchain.ShlibSuffix())
}
- libFlagsList = append(libFlagsList,
- "-l"+strings.TrimSuffix(strings.TrimPrefix(file, "lib"), flags.toolchain.ShlibSuffix()))
+ libFlagsList = append(libFlagsList, lib.String())
ldDirs = append(ldDirs, dir)
}