Change outputDir to baseOutputDir and use variant.dirName