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

Merge "Clean up cc.RegisterRequiredBuildComponentsForTest()" am: 0805d4ebdd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I587cd237e6a3385edcc7b230ca39522d36b35463
This commit is contained in:
Paul Duffin
2021-03-06 08:47:41 +00:00
committed by Automerger Merge Worker
parent 673bce632a 0805d4ebdd
commit b6ae322278
4 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cc/testing.go
View File

@@ -592,6 +592,7 @@ func TestConfig(buildDir string, os android.OsType, env map[string]string,
func CreateTestContext(config android.Config) *android.TestContext { func CreateTestContext(config android.Config) *android.TestContext {
ctx := android.NewTestArchContext(config) ctx := android.NewTestArchContext(config)
genrule.RegisterGenruleBuildComponents(ctx)
ctx.RegisterModuleType("cc_fuzz", FuzzFactory) ctx.RegisterModuleType("cc_fuzz", FuzzFactory)
ctx.RegisterModuleType("cc_test", TestFactory) ctx.RegisterModuleType("cc_test", TestFactory)
ctx.RegisterModuleType("cc_test_library", TestLibraryFactory) ctx.RegisterModuleType("cc_test_library", TestLibraryFactory)

3
java/java_test.go
View File

@@ -25,6 +25,7 @@ import (
"strings" "strings"
"testing" "testing"
"android/soong/genrule"
"github.com/google/blueprint/proptools" "github.com/google/blueprint/proptools"
"android/soong/android" "android/soong/android"
@@ -79,6 +80,8 @@ func testContext(config android.Config) *android.TestContext {
android.RegisterPrebuiltMutators(ctx) android.RegisterPrebuiltMutators(ctx)
genrule.RegisterGenruleBuildComponents(ctx)
// Register module types and mutators from cc needed for JNI testing // Register module types and mutators from cc needed for JNI testing
cc.RegisterRequiredBuildComponentsForTest(ctx) cc.RegisterRequiredBuildComponentsForTest(ctx)

2
rust/testing.go
View File

@@ -17,6 +17,7 @@ package rust
import ( import (
"android/soong/android" "android/soong/android"
"android/soong/cc" "android/soong/cc"
"android/soong/genrule"
) )
func GatherRequiredDepsForTest() string { func GatherRequiredDepsForTest() string {
@@ -211,6 +212,7 @@ func CreateTestContext(config android.Config) *android.TestContext {
ctx := android.NewTestArchContext(config) ctx := android.NewTestArchContext(config)
android.RegisterPrebuiltMutators(ctx) android.RegisterPrebuiltMutators(ctx)
ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators) ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators)
genrule.RegisterGenruleBuildComponents(ctx)
cc.RegisterRequiredBuildComponentsForTest(ctx) cc.RegisterRequiredBuildComponentsForTest(ctx)
RegisterRequiredBuildComponentsForTest(ctx) RegisterRequiredBuildComponentsForTest(ctx)

4
sdk/testing.go
View File

@@ -26,6 +26,7 @@ import (
"android/soong/android" "android/soong/android"
"android/soong/apex" "android/soong/apex"
"android/soong/cc" "android/soong/cc"
"android/soong/genrule"
"android/soong/java" "android/soong/java"
) )
@@ -109,6 +110,9 @@ func testSdkContext(bp string, fs map[string][]byte, extraOsTypes []android.OsTy
// from java package // from java package
java.RegisterRequiredBuildComponentsForTest(ctx) java.RegisterRequiredBuildComponentsForTest(ctx)
// from genrule package
genrule.RegisterGenruleBuildComponents(ctx)
// from cc package // from cc package
cc.RegisterRequiredBuildComponentsForTest(ctx) cc.RegisterRequiredBuildComponentsForTest(ctx)