The IOC Executive Board charted the course for future Olympic Games by returning all sports played in Rio through 2024, which means golf gets extended beyond the 2020 Games in Tokyo.
From an Olympic.org report:
In another decision regarding the Olympic programme, the Executive Board approved the overall composition of the sports programme for the Olympic Games 2024 to include all 28 sports on the programme of the Olympic Games Rio 2016.
As for which city hosts in 2024, the IOC also officially committed to awarding the Games for 2024 and 2028 to the two remaining cities bidding on '24.
The race is between Paris and Los Angeles, with Paris the frontrunner for 2024. Le Golf National will host in France while Riviera Country Club is scheduled to host the golf in Los Angeles.