diff --git a/cc/prebuilt.go b/cc/prebuilt.go
index d6018eb..47994a8 100644
--- a/cc/prebuilt.go
+++ b/cc/prebuilt.go
@@ -82,6 +82,7 @@
 		in := p.Prebuilt.SingleSourcePath(ctx)
 
 		if p.shared() {
+			p.unstrippedOutputFile = in
 			libName := ctx.baseModuleName() + flags.Toolchain.ShlibSuffix()
 			if p.needsStrip(ctx) {
 				stripped := android.PathForModuleOut(ctx, "stripped", libName)
@@ -89,13 +90,11 @@
 				in = stripped
 			}
 
-			if !ctx.Darwin() && !ctx.Windows() {
-				// Optimize out relinking against shared libraries whose interface hasn't changed by
-				// depending on a table of contents file instead of the library itself.
-				tocFile := android.PathForModuleOut(ctx, libName+".toc")
-				p.tocFile = android.OptionalPathForPath(tocFile)
-				TransformSharedObjectToToc(ctx, in, tocFile, builderFlags)
-			}
+			// Optimize out relinking against shared libraries whose interface hasn't changed by
+			// depending on a table of contents file instead of the library itself.
+			tocFile := android.PathForModuleOut(ctx, libName+".toc")
+			p.tocFile = android.OptionalPathForPath(tocFile)
+			TransformSharedObjectToToc(ctx, in, tocFile, builderFlags)
 		}
 
 		return in
@@ -162,6 +161,8 @@
 		fileName := p.getStem(ctx) + flags.Toolchain.ExecutableSuffix()
 		in := p.Prebuilt.SingleSourcePath(ctx)
 
+		p.unstrippedOutputFile = in
+
 		if p.needsStrip(ctx) {
 			stripped := android.PathForModuleOut(ctx, "stripped", fileName)
 			p.strip(ctx, in, stripped, builderFlags)
