Merge \\"Use the full path to the shared lib.\\" am: c2062f9c44

am: af7a4c8bd2

Change-Id: Id6e9a1836b424c45efa4608845a83451ac9a47b2

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)
 	}