diff --git a/cc/cc.go b/cc/cc.go
index 58ea5e1..4c26e60 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -306,6 +306,7 @@
 
 	link(ctx ModuleContext, flags Flags, deps PathDeps, objs Objects) android.Path
 	appendLdflags([]string)
+	unstrippedOutputFilePath() android.Path
 }
 
 type installer interface {
@@ -406,10 +407,8 @@
 }
 
 func (c *Module) UnstrippedOutputFile() android.Path {
-	if library, ok := c.linker.(*libraryDecorator); ok {
-		return library.unstrippedOutputFile
-	} else if binary, ok := c.linker.(*binaryDecorator); ok {
-		return binary.unstrippedOutputFile
+	if c.linker != nil {
+		return c.linker.unstrippedOutputFilePath()
 	}
 	return nil
 }