diff options
| author | 2023-10-24 10:06:54 +0000 | |
|---|---|---|
| committer | 2023-10-24 10:06:54 +0000 | |
| commit | af1c929943dbdba7b1d9481daa207ba36ad4fd1c (patch) | |
| tree | c642a288523cca6eccb454c4cebcd760531c5de6 /java/sdk.go | |
| parent | 7ec40649bbc5ebd4328b79c7f46fe69cc1d254c6 (diff) | |
| parent | 9421c4ceb912ffb27df86d3a9cb0c8e5609e0384 (diff) | |
Merge "SdkTestCore for non-updatable modules" into main
Diffstat (limited to 'java/sdk.go')
| -rw-r--r-- | java/sdk.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/java/sdk.go b/java/sdk.go index 7c702c405..ddd99bb33 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -76,7 +76,8 @@ func systemModuleKind(sdkKind android.SdkKind, apiLevel android.ApiLevel) androi // Core is by definition what is included in the system module for the public API so should // just use its system modules. systemModuleKind = android.SdkPublic - } else if systemModuleKind == android.SdkSystem || systemModuleKind == android.SdkTest { + } else if systemModuleKind == android.SdkSystem || systemModuleKind == android.SdkTest || + systemModuleKind == android.SdkTestFrameworksCore { // The core system and test APIs are currently the same as the public API so they should use // its system modules. systemModuleKind = android.SdkPublic @@ -192,7 +193,7 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext android.SdkContext) bootclasspath: corePlatformBootclasspathLibraries(ctx), noFrameworksLibs: true, } - case android.SdkPublic, android.SdkSystem, android.SdkTest: + case android.SdkPublic, android.SdkSystem, android.SdkTest, android.SdkTestFrameworksCore: return toModule(sdkVersion.Kind.DefaultJavaLibraryName(), sdkFrameworkAidlPath(ctx)) case android.SdkCore: return sdkDep{ |