Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cdcd2be1 authored by Paul Duffin's avatar Paul Duffin
Browse files

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
parent 6bd87750

cc/testing.go

+0 −2
Original line number Diff line number Diff line
@@ -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)