diff options
| author | 2025-02-27 15:39:31 -0800 | |
|---|---|---|
| committer | 2025-02-27 15:39:31 -0800 | |
| commit | 82ada6503a81af7eeed2924a2d2d942375f6c8c2 (patch) | |
| tree | feb014d10d6fe761610bafd23ed382f0c78084ac /api/api_test.go | |
| parent | 2b327ef435fd5d687fd5a65c2ee263ba0ebea5ce (diff) | |
| parent | 450f8ab14dfecc9a5061d30c8e3d6864cc21fb9b (diff) | |
Merge 25Q1 (ab/12770256) to aosp-main-future
Bug: 385190204
Merged-In: Ibc80f09d54bec2c83814874d94a8f8eb22b5075f
Change-Id: If7779ae57fd91631d08bd8af5434c2ddd963aad7
Diffstat (limited to 'api/api_test.go')
| -rw-r--r-- | api/api_test.go | 9 |
1 files changed, 3 insertions, 6 deletions
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": { |