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

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

Clean up cc.RegisterRequiredBuildComponentsForTest() 

Changes this function so it only registers components from the cc
package by pushing the call to genrule.RegisterGenruleBuildComponents()
down into those packages whose tests need it.

This will make it easier to migrate cc package tests to test fixtures
as the RegisterRequiredBuildComponentsForTest() no longer overlaps with
preparers from the genrule packages.

Bug: 181070625
Test: m nothing
Change-Id: Ic00c7e480dc738d7a88d038aca6ab95a1502a24a
parent a560d5a9

cc/testing.go

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ func RegisterRequiredBuildComponentsForTest(ctx android.RegistrationContext) { 
	RegisterBinaryBuildComponents(ctx)

	RegisterLibraryBuildComponents(ctx)

	RegisterLibraryHeadersBuildComponents(ctx)

	genrule.RegisterGenruleBuildComponents(ctx)



	ctx.RegisterModuleType("toolchain_library", ToolchainLibraryFactory)

	ctx.RegisterModuleType("llndk_library", LlndkLibraryFactory)
@@ -591,6 +590,7 @@ func TestConfig(buildDir string, os android.OsType, env map[string]string, 


func CreateTestContext(config android.Config) *android.TestContext {

	ctx := android.NewTestArchContext(config)

	genrule.RegisterGenruleBuildComponents(ctx)

	ctx.RegisterModuleType("cc_fuzz", FuzzFactory)

	ctx.RegisterModuleType("cc_test", TestFactory)

	ctx.RegisterModuleType("cc_test_library", TestLibraryFactory)

java/java_test.go

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import ( 
	"strings"

	"testing"



	"android/soong/genrule"

	"github.com/google/blueprint/proptools"



	"android/soong/android"
@@ -79,6 +80,8 @@ func testContext(config android.Config) *android.TestContext { 


	android.RegisterPrebuiltMutators(ctx)



	genrule.RegisterGenruleBuildComponents(ctx)



	// Register module types and mutators from cc needed for JNI testing

	cc.RegisterRequiredBuildComponentsForTest(ctx)

rust/testing.go

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package rust 
import (

	"android/soong/android"

	"android/soong/cc"

	"android/soong/genrule"

)



func GatherRequiredDepsForTest() string {
@@ -211,6 +212,7 @@ func CreateTestContext(config android.Config) *android.TestContext { 
	ctx := android.NewTestArchContext(config)

	android.RegisterPrebuiltMutators(ctx)

	ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators)

	genrule.RegisterGenruleBuildComponents(ctx)

	cc.RegisterRequiredBuildComponentsForTest(ctx)

	RegisterRequiredBuildComponentsForTest(ctx)

sdk/testing.go

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import ( 
	"android/soong/android"

	"android/soong/apex"

	"android/soong/cc"

	"android/soong/genrule"

	"android/soong/java"

)
@@ -109,6 +110,9 @@ func testSdkContext(bp string, fs map[string][]byte, extraOsTypes []android.OsTy 
	// from java package

	java.RegisterRequiredBuildComponentsForTest(ctx)



	// from genrule package

	genrule.RegisterGenruleBuildComponents(ctx)



	// from cc package

	cc.RegisterRequiredBuildComponentsForTest(ctx)