StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix build break caused by registering genrules twice" am: 6d3e726887 am: bbb10d2452

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621418

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7ca9769d8c7fa29e21afc15377eb5e52d0bfb5c
This commit is contained in:
Paul Duffin
2021-03-06 11:11:17 +00:00
committed by Automerger Merge Worker
parent 180b50c12f bbb10d2452
commit 6ce4598e3c
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/testing.go
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)