diff options
| author | 2024-08-12 16:53:42 +0000 | |
|---|---|---|
| committer | 2024-08-12 16:53:42 +0000 | |
| commit | 08b606153943332075a202450162b02f3eea523a (patch) | |
| tree | cc5ea4861fa71eb1c12326ae28fbca80bf86cb40 /sdk/sdk_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 'sdk/sdk_test.go')
| -rw-r--r-- | sdk/sdk_test.go | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sdk/sdk_test.go b/sdk/sdk_test.go index 4894210d4..057b370d3 100644 --- a/sdk/sdk_test.go +++ b/sdk/sdk_test.go @@ -457,11 +457,7 @@ java_import { android.FixtureMergeEnv(map[string]string{ "SOONG_SDK_SNAPSHOT_TARGET_BUILD_RELEASE": "S", }), - android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) { - variables.BuildFlags = map[string]string{ - "RELEASE_HIDDEN_API_EXPORTABLE_STUBS": "true", - } - }), + android.PrepareForTestWithBuildFlag("RELEASE_HIDDEN_API_EXPORTABLE_STUBS", "true"), ).RunTest(t) CheckSnapshot(t, result, "mysdk", "", @@ -573,11 +569,9 @@ java_sdk_library_import { "SOONG_SDK_SNAPSHOT_TARGET_BUILD_RELEASE": "S", }), android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) { - variables.BuildFlags = map[string]string{ - "RELEASE_HIDDEN_API_EXPORTABLE_STUBS": "true", - } variables.Platform_version_active_codenames = []string{"UpsideDownCake", "Tiramisu", "S-V2"} }), + android.PrepareForTestWithBuildFlag("RELEASE_HIDDEN_API_EXPORTABLE_STUBS", "true"), ).RunTest(t) CheckSnapshot(t, result, "mysdk", "", |