diff --git a/cc/builder.go b/cc/builder.go
index 4c86110..c843c2d 100644
--- a/cc/builder.go
+++ b/cc/builder.go
@@ -67,6 +67,13 @@
 		},
 		"arCmd", "arFlags")
 
+	prefixSymbols = pctx.StaticRule("prefixSymbols",
+		blueprint.RuleParams{
+			Command:     "$objcopyCmd --prefix-symbols=${prefix} ${in} ${out}",
+			Description: "prefixSymbols $out",
+		},
+		"objcopyCmd", "prefix")
+
 	copyGccLibPath = pctx.StaticVariable("copyGccLibPath", "${SrcDir}/build/soong/copygcclib.sh")
 
 	copyGccLib = pctx.StaticRule("copyGccLib",
@@ -272,6 +279,24 @@
 	})
 }
 
+// Generate a rule for runing objcopy --prefix-symbols on a binary
+func TransformBinaryPrefixSymbols(ctx common.AndroidModuleContext, prefix string, inputFile string,
+	flags builderFlags, outputFile string) {
+
+	objcopyCmd := gccCmd(flags.toolchain, "objcopy")
+
+	ctx.Build(pctx, blueprint.BuildParams{
+		Rule:      prefixSymbols,
+		Outputs:   []string{outputFile},
+		Inputs:    []string{inputFile},
+		Implicits: []string{objcopyCmd},
+		Args: map[string]string{
+			"objcopyCmd": objcopyCmd,
+			"prefix":     prefix,
+		},
+	})
+}
+
 func CopyGccLib(ctx common.AndroidModuleContext, libName string,
 	flags builderFlags, outputFile string) {
 
diff --git a/cc/cc.go b/cc/cc.go
index 64a7526..8217030 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -1271,6 +1271,12 @@
 
 	outputFile := filepath.Join(common.ModuleOutDir(ctx), c.getStem(ctx))
 	c.out = outputFile
+	if c.BinaryProperties.Prefix_symbols != "" {
+		afterPrefixSymbols := outputFile
+		outputFile = outputFile + ".intermediate"
+		TransformBinaryPrefixSymbols(ctx, c.BinaryProperties.Prefix_symbols, outputFile,
+			ccFlagsToBuilderFlags(flags), afterPrefixSymbols)
+	}
 
 	TransformObjToDynamicBinary(ctx, objFiles, deps.SharedLibs, deps.StaticLibs,
 		deps.LateStaticLibs, deps.WholeStaticLibs, deps.CrtBegin, deps.CrtEnd, true,
