commit 6d3e72688729ea72bf64f1e7dacccc5b57f384be
author Paul Duffin <paulduffin@google.com> Sat Mar 06 10:09:15 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Mar 06 10:09:15 2021 +0000
tree 3f99f30135b1acae1a7e81b8e751b06283902ecb
parent 77bfa3e7925060786af5bd5bcad56878320d92d4
parent cdcd2be1ffee4a66ee7786edf7bb9c960d4a6c55

Merge "Fix build break caused by registering genrules twice"

cc/testing.go

diff --git a/cc/testing.go b/cc/testing.go
index acf37a5..f62c5f1 100644
--- a/cc/testing.go
+++ b/cc/testing.go
@@ -20,8 +20,6 @@
 )
 
 func RegisterRequiredBuildComponentsForTest(ctx android.RegistrationContext) {
-	// Genrule components must be registered before anything from cc to match runtime behavior.
-	genrule.RegisterGenruleBuildComponents(ctx)
 	RegisterPrebuiltBuildComponents(ctx)
 	RegisterCCBuildComponents(ctx)
 	RegisterBinaryBuildComponents(ctx)