From 989825d3f064fe20903db70e7a234f67dcdc6f5e Mon Sep 17 00:00:00 2001 From: Harshit Mahajan Date: Wed, 9 Oct 2024 12:42:55 +0000 Subject: Separating framework platform crashrecovery jar Creating new jar "framework-platformcrashrecovery". This would separate all the apis to a different sdk library while still being part of core platform. This jar is behind release_crashrecovery_module flag which also controls enabling CrashRecovery module apex. Based on the flag only one of platformcrashrecovery jar or CrashRecovery Apex will be used. So essentially on device if release_crashrecovery_module flag is 1. true: CrashRecovery Apex is present, this jar is not used 2. false: CrashRecovery Apex is not used, this jar is present Bug: 289203818 Test: Jar is present in Bootclasspath on device Test: ExplcitHealthCheckService registered on device Flag: build.release_crashrecovery_module Change-Id: I4696e74a1ba236614398b48a6d7145777079286b --- api/api_test.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'api/api_test.go') diff --git a/api/api_test.go b/api/api_test.go index 166f053978f2..28109b5ea2cf 100644 --- a/api/api_test.go +++ b/api/api_test.go @@ -78,10 +78,7 @@ func gatherRequiredDepsForTest() string { "stub-annotations", } - extraSdkLibraryModules := []string{ - "framework-virtualization", - "framework-location", - } + extraSdkLibraryModules := non_updatable_modules extraSystemModules := []string{ "core-public-stubs-system-modules", @@ -184,10 +181,10 @@ func gatherRequiredDepsForTest() string { func TestCombinedApisDefaults(t *testing.T) { + testNonUpdatableModules := append(non_updatable_modules, "framework-foo", "framework-bar") result := android.GroupFixturePreparers( prepareForTestWithCombinedApis, - java.FixtureWithLastReleaseApis( - "framework-location", "framework-virtualization", "framework-foo", "framework-bar"), + java.FixtureWithLastReleaseApis(testNonUpdatableModules...), android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) { variables.VendorVars = map[string]map[string]string{ "boolean_var": { -- cgit v1.2.3-59-g8ed1b