Merge "Reland "Symbols for libs in APEXes are available"" am: 3a30e13683 am: c49fa7b522

am: 11eda2d3dd

Change-Id: Ifb6e8f8d6192d2a65f2d52bbd17bd2d5daaa94be

cc/cc.go

@@ -404,6 +404,15 @@ func (c *Module) OutputFile() android.OptionalPath {
 	return c.outputFile
 }
 
+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
+	}
+	return nil
+}
+
 func (c *Module) Init() android.Module {
 	c.AddProperties(&c.Properties, &c.VendorProperties)
 	if c.compiler != nil {