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
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)