diff options
| author | 2024-01-06 17:53:41 +0000 | |
|---|---|---|
| committer | 2024-01-06 17:53:41 +0000 | |
| commit | 208444ce5d9bd9ca013dc81438ef62d6ac4a461f (patch) | |
| tree | e1d18d98fcfdddd209411184847905722819a11c /sysprop/sysprop_test.go | |
| parent | b9176417ebd4c38a81f3fb2e28cc35a82764d037 (diff) | |
| parent | 3bb9924c87bf4107ba361fc1ccb6c7dfd9446f75 (diff) | |
Merge changes from topics "revert-2897484-revert-2897682-dont_limit_systemsdk-JCOOOXGAIF-BSJGJAJAWC", "revert-2897568-revert-2894701-limit_systemsdk-WNEMOTGMRS-ROJNXPXKUV" into main
* changes:
Revert^2 "Add BUILD_BROKEN_DONT_CHECK_SYSTEMSDK"
Revert "Revert "Limit System SDK to 34 for Java modules in the v..."
Diffstat (limited to 'sysprop/sysprop_test.go')
| -rw-r--r-- | sysprop/sysprop_test.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sysprop/sysprop_test.go b/sysprop/sysprop_test.go index e51fe39c9..e5b3dea05 100644 --- a/sysprop/sysprop_test.go +++ b/sysprop/sysprop_test.go @@ -125,6 +125,12 @@ func test(t *testing.T, bp string) *android.TestResult { variables.DeviceSystemSdkVersions = []string{"28"} variables.DeviceVndkVersion = proptools.StringPtr("current") variables.Platform_vndk_version = proptools.StringPtr("29") + variables.DeviceCurrentApiLevelForVendorModules = proptools.StringPtr("28") + }), + java.FixtureWithPrebuiltApis(map[string][]string{ + "28": {}, + "29": {}, + "30": {}, }), mockFS.AddToFixture(), android.FixtureWithRootAndroidBp(bp), |