From cdcd2be1ffee4a66ee7786edf7bb9c960d4a6c55 Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Sat, 6 Mar 2021 10:00:12 +0000
Subject: [PATCH] Fix build break caused by registering genrules twice

Two separate changes that passed presubmits separately and did not
conflict when merged together unfortunately clashed at runtime. The
changes are:
* Ic00c7e480dc738d7a88d038aca6ab95a1502a24a
* Ic98fdc29a63155174a3227e7e918b26f0a8763bb

Test: m nothing
Change-Id: I7b5704c22cc2ea2095f5fb92c59f0526bb445f13
---
 cc/testing.go | 2 --
 1 file changed, 2 deletions(-)

diff --git a/cc/testing.go b/cc/testing.go
index acf37a5e2..f62c5f114 100644
--- a/cc/testing.go
+++ b/cc/testing.go
@@ -20,8 +20,6 @@ import (
 )
 
 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)