Oppo has struck a cross-licensing deal with Nokia Oyj, ending a years-long dispute and allowing the Chinese smartphone major to freely sell devices in key European markets including Germany.