diff --git a/cc/cc.go b/cc/cc.go index 9062b0027..fef72ccaf 100644 --- a/cc/cc.go +++ b/cc/cc.go @@ -845,8 +845,10 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps { } if tag == reuseObjTag { - depPaths.Objs = depPaths.Objs.Append(cc.compiler.(libraryInterface).reuseObjs()) - return + if l, ok := cc.compiler.(libraryInterface); ok { + depPaths.Objs = depPaths.Objs.Append(l.reuseObjs()) + return + } } if t, ok := tag.(dependencyTag); ok && t.library { diff --git a/cc/prebuilt.go b/cc/prebuilt.go index 4328df8a0..0a5457029 100644 --- a/cc/prebuilt.go +++ b/cc/prebuilt.go @@ -60,13 +60,14 @@ func (p *prebuiltLibraryLinker) link(ctx ModuleContext, } func prebuiltSharedLibraryFactory() (blueprint.Module, []interface{}) { - module, library := NewLibrary(android.HostAndDeviceSupported, true, false) + module, library := NewLibrary(android.HostAndDeviceSupported, true, true) module.compiler = nil prebuilt := &prebuiltLibraryLinker{ libraryDecorator: library, } module.linker = prebuilt + module.installer = prebuilt return module.Init() }