The president said that he would set country-specific rates in less than two weeks — after reaching a tariff deal with China.