@@ -118,7 +118,11 @@ internal fun Project.createProductFlavorConfigurations(
118118 val buildTypedSubFlavor = nameOf(subFlavor, variant.buildType.orEmpty())
119119 log.d { " Creating buildTyped sub product flavor configuration ${buildTypedSubFlavor.greasify()} ..." }
120120 val config = createGrease(buildTypedSubFlavor, isTransitive)
121+ config.attributes {
122+ attribute(BuildTypeAttr .ATTRIBUTE , objects.named(BuildTypeAttr ::class , variant.buildType.orEmpty()))
123+ }
121124 config.extendsFromSafely(grease(isTransitive), log)
125+ config.extendsFromSafely(greaseOf(variant.buildType.orEmpty(), isTransitive), log)
122126 config.extendsFromSafely(greaseOf(subFlavor, isTransitive), log)
123127 config.extendsFromSafely(flavorConfiguration, log)
124128 }
@@ -153,6 +157,9 @@ internal fun Project.createVariantConfigurations(
153157) = androidComponent.onVariants { variant ->
154158 log.d { " Creating variant configuration ${variant.name.greasify()} ..." }
155159 val config = createGrease(variant.name, isTransitive)
160+ config.attributes {
161+ attribute(BuildTypeAttr .ATTRIBUTE , objects.named(BuildTypeAttr ::class , variant.buildType.orEmpty()))
162+ }
156163 config.extendsFromSafely(grease(isTransitive), log)
157164 config.extendsFromSafely(greaseOf(variant.buildType.orEmpty(), isTransitive), log)
158165 variant.flavorName?.let { flavor ->
0 commit comments