From a66b4630f60847c216699831b99aeb905362ccda Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 8 Aug 2024 15:50:47 -0700 Subject: Add PrepareForTestWithBuildFlag Add a helper function that creates a test fixture preparer that sets a build flag, and use it everywhere that was setting build flags manually. Test: all soong tests Flag: EXEMPT refactor Change-Id: I68d50d68787a30d091f0827e8caa51f5c5a762ef --- java/java_test.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'java/java_test.go') 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") -- cgit v1.2.3-59-g8ed1b