Merge "Include Ravenwood tests in `general-tests`." into main (433be482) · Commits · e / os / android_build_soong

java/ravenwood.go

+10 −3

Original line number	Diff line number	Diff line
		@@ -53,7 +53,10 @@ func ravenwoodTestFactory() android.Module {
		module.Module.dexpreopter.isTest = true
		module.Module.linter.properties.Lint.Test = proptools.BoolPtr(true)

		module.testProperties.Test_suites = []string{"ravenwood-tests"}
		module.testProperties.Test_suites = []string{
		"general-tests",
		"ravenwood-tests",
		}
		module.testProperties.Test_options.Unit_test = proptools.BoolPtr(false)

		InitJavaModule(module, android.DeviceSupported)
		@@ -123,7 +126,8 @@ func (r *ravenwoodTest) AndroidMkEntries() []android.AndroidMkEntries {
		entries.ExtraEntries = append(entries.ExtraEntries,
		func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {
		entries.SetBool("LOCAL_UNINSTALLABLE_MODULE", true)
		entries.AddStrings("LOCAL_COMPATIBILITY_SUITE", "ravenwood-tests")
		entries.AddStrings("LOCAL_COMPATIBILITY_SUITE",
		"general-tests", "ravenwood-tests")
		if r.testConfig != nil {
		entries.SetPath("LOCAL_FULL_TEST_CONFIG", r.testConfig)
		}
		@@ -157,7 +161,10 @@ func (r ravenwoodLibgroup) InstallForceOS() (android.OsType, *android.ArchType
		return &r.forceOSType, &r.forceArchType
		}
		func (r *ravenwoodLibgroup) TestSuites() []string {
		return []string{"ravenwood-tests"}
		return []string{
		"general-tests",
		"ravenwood-tests",
		}
		}

		func (r *ravenwoodLibgroup) DepsMutator(ctx android.BottomUpMutatorContext) {