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

Commit 7a127f97 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Support 'test_config' into soong modules"

parents 1eca921e e146e39f

cc/androidmk.go

+8 −0
Original line number Diff line number Diff line
@@ -248,6 +248,10 @@ func (benchmark *benchmarkDecorator) AndroidMk(ctx AndroidMkContext, ret *androi 
			fmt.Fprintln(w, "LOCAL_COMPATIBILITY_SUITE :=",

				strings.Join(benchmark.Properties.Test_suites, " "))

		}

		if benchmark.Properties.Test_config != nil {

			fmt.Fprintln(w, "LOCAL_TEST_CONFIG :=",

				benchmark.Properties.Test_config)

		}

		fmt.Fprintln(w, "LOCAL_NATIVE_BENCHMARK := true")

	})
@@ -266,6 +270,10 @@ func (test *testBinary) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkDa 
			fmt.Fprintln(w, "LOCAL_COMPATIBILITY_SUITE :=",

				strings.Join(test.Properties.Test_suites, " "))

		}

		if test.Properties.Test_config != nil {

			fmt.Fprintln(w, "LOCAL_TEST_CONFIG :=",

				test.Properties.Test_config)

		}

	})



	androidMkWriteTestData(test.data, ctx, ret)

cc/test.go

+9 −1
Original line number Diff line number Diff line
@@ -44,6 +44,10 @@ type TestBinaryProperties struct { 
	// list of compatibility suites (for example "cts", "vts") that the module should be

	// installed into.

	Test_suites []string `android:"arch_variant"`



	// the name of the test configuration (for example "AndroidTest.xml") that should be

	// installed with the module.

	Test_config *string `android:"arch_variant"`

}



func init() {
@@ -304,7 +308,11 @@ type BenchmarkProperties struct { 


	// list of compatibility suites (for example "cts", "vts") that the module should be

	// installed into.

	Test_suites []string

	Test_suites []string `android:"arch_variant"`



	// the name of the test configuration (for example "AndroidTest.xml") that should be

	// installed with the module.

	Test_config *string `android:"arch_variant"`

}



type benchmarkDecorator struct {

java/androidmk.go

+8 −0
Original line number Diff line number Diff line
@@ -107,6 +107,10 @@ func (j *Test) AndroidMk() android.AndroidMkData { 
			fmt.Fprintln(w, "LOCAL_COMPATIBILITY_SUITE :=",

				strings.Join(j.testProperties.Test_suites, " "))

		}

		if j.testProperties.Test_config != nil {

			fmt.Fprintln(w, "LOCAL_TEST_CONFIG :=",

				*j.testProperties.Test_config)

		}

	})



	return data
@@ -241,6 +245,10 @@ func (a *AndroidTest) AndroidMk() android.AndroidMkData { 
			fmt.Fprintln(w, "LOCAL_COMPATIBILITY_SUITE :=",

				strings.Join(a.testProperties.Test_suites, " "))

		}

		if a.testProperties.Test_config != nil {

			fmt.Fprintln(w, "LOCAL_TEST_CONFIG :=",

				*a.testProperties.Test_config)

		}

	})



	return data

java/java.go

+4 −0
Original line number Diff line number Diff line
@@ -1352,6 +1352,10 @@ type testProperties struct { 
	// list of compatibility suites (for example "cts", "vts") that the module should be

	// installed into.

	Test_suites []string `android:"arch_variant"`



	// the name of the test configuration (for example "AndroidTest.xml") that should be

	// installed with the module.

	Test_config *string `android:"arch_variant"`

}



type Test struct {

python/androidmk.go

+5 −0
Original line number Diff line number Diff line
@@ -66,6 +66,11 @@ func (p *testDecorator) AndroidMk(base *Module, ret *android.AndroidMkData) { 
			fmt.Fprintln(w, "LOCAL_COMPATIBILITY_SUITE :=",

				strings.Join(p.binaryDecorator.binaryProperties.Test_suites, " "))

		}

		// If the test config has an explicit config specified use it.

		if p.testProperties.Test_config != nil {

			fmt.Fprintln(w, "LOCAL_TEST_CONFIG :=",

				*p.testProperties.Test_config)

		}

	})

	base.subAndroidMk(ret, p.binaryDecorator.pythonInstaller)

}