Merge "Fix build break caused by registering genrules twice"

This commit is contained in:
Paul Duffin
2021-03-06 10:09:15 +00:00
committed by Gerrit Code Review

View File

@@ -20,8 +20,6 @@ import (
) )
func RegisterRequiredBuildComponentsForTest(ctx android.RegistrationContext) { func RegisterRequiredBuildComponentsForTest(ctx android.RegistrationContext) {
// Genrule components must be registered before anything from cc to match runtime behavior.
genrule.RegisterGenruleBuildComponents(ctx)
RegisterPrebuiltBuildComponents(ctx) RegisterPrebuiltBuildComponents(ctx)
RegisterCCBuildComponents(ctx) RegisterCCBuildComponents(ctx)
RegisterBinaryBuildComponents(ctx) RegisterBinaryBuildComponents(ctx)