- update universal target to build dynamic target with static flag - organize scheme order to match the target order