The Giants reached agreement on a one-year, guaranteed $4.7 million contract with free-agent outfielder Norichika Aoki.