diff options
Diffstat (limited to 'apex/prebuilt.go')
| -rw-r--r-- | apex/prebuilt.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apex/prebuilt.go b/apex/prebuilt.go index 4833a644b..d7be9a9e1 100644 --- a/apex/prebuilt.go +++ b/apex/prebuilt.go @@ -176,13 +176,15 @@ func (p *prebuiltCommon) initApexFilesForAndroidMk(ctx android.ModuleContext) { name := android.RemoveOptionalPrebuiltPrefix(ctx.OtherModuleName(child)) if java.IsBootclasspathFragmentContentDepTag(tag) || tag == exportedJavaLibTag { // If the exported java module provides a dex jar path then add it to the list of apexFiles. - path := child.(interface{ DexJarBuildPath() android.Path }).DexJarBuildPath() - if path != nil { + path := child.(interface { + DexJarBuildPath() java.OptionalDexJarPath + }).DexJarBuildPath() + if path.IsSet() { af := apexFile{ module: child, moduleDir: ctx.OtherModuleDir(child), androidMkModuleName: name, - builtFile: path, + builtFile: path.Path(), class: javaSharedLib, } if module, ok := child.(java.DexpreopterInterface); ok { |