Calderon, who will receive full pay for the undisclosed deal, averaged 3.3 points, 2.1 assists and 12.2 minutes in 24 games, including 11 starts, for the Los Angeles Lakers this season.
He was briefly signed after the injury to Kevin Durant was learned to be more serious, a Grade 2 sprained MCL and a bone bruise on his left leg that will keep him the All-Star out at least four weeks.
The Warriors are expected to sign 37-year-old winger Matt Barnes, according to multiple media reports. Barnes also posted on social media that he is rejoining Golden State, the team he was with in 2006-07 and 2007-09. He reportedly will sign a rest-of-the-season deal with Golden State, as opposed to a 10-day contract.