summaryrefslogtreecommitdiff
path: root/api/api_test.go
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2025-03-08 16:09:51 -0800
committer Xin Li <delphij@google.com> 2025-03-08 16:09:51 -0800
commit648ca6e51d9611726da79c45b1e1920f409d573f (patch)
treecaabc3c169e3700cb6d9f4eedab099216693f4b2 /api/api_test.go
parent05b45303b1c5fef18509e409c47a8674b81c84b2 (diff)
parent4d65e1d62ba2c0d0ad50e756508ec799a44efd06 (diff)
Merge 25Q1 (ab/BP1A.250305.020) to AOSP main
Bug: 385190204 Merged-In: I04ad7e5905395350cb84f9a062d1ae0b325fdb28 Change-Id: I2186b603f2c4b83db047f9123f9615e00f6e6986
Diffstat (limited to 'api/api_test.go')
-rw-r--r--api/api_test.go9
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": {