Angelina Jolie has dropped her legal battle with a perfume-maker who planned to give her new fragrance the same name as the star's daughter Shiloh.