diff options
author | 2024-08-12 16:53:42 +0000 | |
---|---|---|
committer | 2024-08-12 16:53:42 +0000 | |
commit | 08b606153943332075a202450162b02f3eea523a (patch) | |
tree | cc5ea4861fa71eb1c12326ae28fbca80bf86cb40 /java/java.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 'java/java.go')
-rw-r--r-- | java/java.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go index be3f90b20..126d8f3a4 100644 --- a/java/java.go +++ b/java/java.go @@ -2261,8 +2261,9 @@ func (al *ApiLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) { staticLibs = append(staticLibs, provider.HeaderJars...) } case systemModulesTag: - module := dep.(SystemModulesProvider) - systemModulesPaths = append(systemModulesPaths, module.HeaderJars()...) + if sm, ok := android.OtherModuleProvider(ctx, dep, SystemModulesProvider); ok { + systemModulesPaths = append(systemModulesPaths, sm.HeaderJars...) + } case metalavaCurrentApiTimestampTag: if currentApiTimestampProvider, ok := dep.(currentApiTimestampProvider); ok { al.validationPaths = append(al.validationPaths, currentApiTimestampProvider.CurrentApiTimestamp()) |