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

Commit bc34d495 authored by Aditya Choudhary's avatar Aditya Choudhary Committed by Gerrit Code Review
Browse files

Merge "Add test spec provider to test modules." into main

parents 3f7d0f67 87b2ab28

cc/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ bootstrap_go_package { 
        "soong-multitree",

        "soong-snapshot",

        "soong-sysprop-bp2build",

        "soong-testing",

        "soong-tradefed",

    ],

    srcs: [

cc/cc.go

+8 −3
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import ( 
	"strconv"

	"strings"



	"android/soong/testing"

	"android/soong/ui/metrics/bp2build_metrics_proto"



	"github.com/google/blueprint"
@@ -865,6 +866,7 @@ type Module struct { 
	hod        android.HostOrDeviceSupported

	multilib   android.Multilib

	bazelable  bool

	testModule bool



	// Allowable SdkMemberTypes of this module type.

	sdkMemberTypes []android.SdkMemberType
@@ -2329,6 +2331,9 @@ func (c *Module) GenerateAndroidBuildActions(actx android.ModuleContext) { 
			}

		}

	}

	if c.testModule {

		ctx.SetProvider(testing.TestModuleProviderKey, testing.TestModuleProviderData{})

	}



	c.maybeInstall(ctx, apexInfo)

}

cc/fuzz.go

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ func fuzzMutatorDeps(mctx android.TopDownMutatorContext) { 
// your device, or $ANDROID_PRODUCT_OUT/data/fuzz in your build tree.

func LibFuzzFactory() android.Module {

	module := NewFuzzer(android.HostAndDeviceSupported)

	module.testModule = true

	return module.Init()

}

cc/test.go

+3 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ func init() { 
func TestFactory() android.Module {

	module := NewTest(android.HostAndDeviceSupported, true)

	module.bazelHandler = &ccTestBazelHandler{module: module}

	module.testModule = true

	return module.Init()

}
@@ -158,12 +159,14 @@ func TestLibraryFactory() android.Module { 
// binary.

func BenchmarkFactory() android.Module {

	module := NewBenchmark(android.HostAndDeviceSupported)

	module.testModule = true

	return module.Init()

}



// cc_test_host compiles a test host binary.

func TestHostFactory() android.Module {

	module := NewTest(android.HostSupported, true)

	module.testModule = true

	return module.Init()

}

rust/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ bootstrap_go_package { 
        "soong-cc",

        "soong-rust-config",

        "soong-snapshot",

        "soong-testing",

    ],

    srcs: [

        "afdo.go",