diff options
| author | 2024-08-12 16:53:42 +0000 | |
|---|---|---|
| committer | 2024-08-12 16:53:42 +0000 | |
| commit | 08b606153943332075a202450162b02f3eea523a (patch) | |
| tree | cc5ea4861fa71eb1c12326ae28fbca80bf86cb40 /java/java_test.go | |
| parent | 9dfccb91a5dfc1bf3637a52165081a54c81c159d (diff) | |
| parent | b61c2269435276862c927f40915e9888ae7908f4 (diff) | |
Merge changes If313580b,I68d50d68 into main
* changes:
Use a provider for systems modules
Add PrepareForTestWithBuildFlag
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/java/java_test.go b/java/java_test.go index 2d4fca240..86bfe9fe4 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -2634,11 +2634,7 @@ func TestMultiplePrebuilts(t *testing.T) { for _, tc := range testCases { ctx := android.GroupFixturePreparers( prepareForJavaTest, - android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) { - variables.BuildFlags = map[string]string{ - "RELEASE_APEX_CONTRIBUTIONS_ADSERVICES": "myapex_contributions", - } - }), + android.PrepareForTestWithBuildFlag("RELEASE_APEX_CONTRIBUTIONS_ADSERVICES", "myapex_contributions"), ).RunTestWithBp(t, fmt.Sprintf(bp, tc.selectedDependencyName)) // check that rdep gets the correct variation of dep @@ -2708,11 +2704,7 @@ func TestMultiplePlatformCompatConfigPrebuilts(t *testing.T) { ctx := android.GroupFixturePreparers( prepareForJavaTest, PrepareForTestWithPlatformCompatConfig, - android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) { - variables.BuildFlags = map[string]string{ - "RELEASE_APEX_CONTRIBUTIONS_ADSERVICES": "myapex_contributions", - } - }), + android.PrepareForTestWithBuildFlag("RELEASE_APEX_CONTRIBUTIONS_ADSERVICES", "myapex_contributions"), ).RunTestWithBp(t, fmt.Sprintf(bp, tc.selectedDependencyName)) mergedGlobalConfig := ctx.SingletonForTests("platform_compat_config_singleton").Output("compat_config/merged_compat_config.xml") |