Merge "Move markPlatformAvailability mutator before apexMutator" am: c75bf688cb am: 2b7d228aac

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1705264

Change-Id: I22a5b245fe9c3c3c4867e450503a6fb1ebcce4b2
This commit is contained in:
Paul Duffin
2021-05-13 10:24:07 +00:00
committed by Automerger Merge Worker

View File

@@ -69,10 +69,12 @@ func RegisterPostDepsMutators(ctx android.RegisterMutatorsContext) {
ctx.BottomUp("apex_unique", apexUniqueVariationsMutator).Parallel()
ctx.BottomUp("apex_test_for_deps", apexTestForDepsMutator).Parallel()
ctx.BottomUp("apex_test_for", apexTestForMutator).Parallel()
// Run mark_platform_availability before the apexMutator as the apexMutator needs to know whether
// it should create a platform variant.
ctx.BottomUp("mark_platform_availability", markPlatformAvailability).Parallel()
ctx.BottomUp("apex", apexMutator).Parallel()
ctx.BottomUp("apex_directly_in_any", apexDirectlyInAnyMutator).Parallel()
ctx.BottomUp("apex_flattened", apexFlattenedMutator).Parallel()
ctx.BottomUp("mark_platform_availability", markPlatformAvailability).Parallel()
}
type apexBundleProperties struct {