From 561c7765ded4a5e52420c2f07863e83b4f0bf984 Mon Sep 17 00:00:00 2001 From: Pedro Loureiro Date: Thu, 13 Jan 2022 14:05:15 +0000 Subject: [PATCH] Add special case for test-only module in configuredJars method Same pattern used for com.android.sdkext / test_framework-sdkextensions Test: m nothing Test: also tried this with related CLs that make use of this functionality Bug: 195732042 Change-Id: I5adfb0e8650e2e262bf646e56b29965798d0a42f --- java/bootclasspath_fragment.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go index fee51d72b..47941807c 100644 --- a/java/bootclasspath_fragment.go +++ b/java/bootclasspath_fragment.go @@ -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()) {