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

Commit e4c255cb authored by Pedro Loureiro's avatar Pedro Loureiro Committed by Gerrit Code Review
Browse files

Merge "Add special case for test-only module in configuredJars method"

parents c7afdefa 561c7765

java/bootclasspath_fragment.go

+2 −0
Original line number Diff line number Diff line
@@ -669,6 +669,8 @@ func (b *BootclasspathFragmentModule) configuredJars(ctx android.ModuleContext) 
	// This is an exception to support end-to-end test for SdkExtensions, until such support exists.

	if android.InList("test_framework-sdkextensions", possibleUpdatableModules) {

		jars = jars.Append("com.android.sdkext", "test_framework-sdkextensions")

	} else if android.InList("AddNewActivity", possibleUpdatableModules) {

		jars = jars.Append("test_com.android.cts.frameworkresapkplits", "AddNewActivity")

	} else if android.InList("test_framework-apexd", possibleUpdatableModules) {

		jars = jars.Append("com.android.apex.test_package", "test_framework-apexd")

	} else if global.ApexBootJars.Len() != 0 && !android.IsModuleInVersionedSdk(ctx.Module()) {