diff options
| author | 2021-11-03 15:32:42 +0000 | |
|---|---|---|
| committer | 2021-11-03 15:32:42 +0000 | |
| commit | 8380ee66a590e468daa5efe2855c46c57e4eed84 (patch) | |
| tree | 3b5551d3b50a7653ca669c314ede83887624e47e /java/testing.go | |
| parent | 5506c1658c654c8d97c6e7f41116678384e2e50b (diff) | |
| parent | 004547facd2b7d95cbd757a7bb076ac1c1b82ab9 (diff) | |
Merge "Use module-lib system modules when building from prebuilts"
Diffstat (limited to 'java/testing.go')
| -rw-r--r-- | java/testing.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/testing.go b/java/testing.go index fafc8d760..3397e4667 100644 --- a/java/testing.go +++ b/java/testing.go @@ -172,9 +172,10 @@ func prebuiltApisFilesForModules(apiLevels []string, modules []string) map[strin fs := make(map[string][]byte) for _, level := range apiLevels { + apiLevel := android.ApiLevelForTest(level) for _, sdkKind := range []android.SdkKind{android.SdkPublic, android.SdkSystem, android.SdkModule, android.SdkSystemServer, android.SdkTest} { // A core-for-system-modules file must only be created for the sdk kind that supports it. - if sdkKind == systemModuleKind() { + if sdkKind == systemModuleKind(sdkKind, apiLevel) { fs[fmt.Sprintf("prebuilts/sdk/%s/%s/core-for-system-modules.jar", level, sdkKind)] = nil } |