diff options
| author | 2022-09-16 10:50:04 +0000 | |
|---|---|---|
| committer | 2022-09-16 10:50:04 +0000 | |
| commit | cd73714b8846cb38a9683acfb8c164a4b4f3bcff (patch) | |
| tree | f70c57695951bff158c5a70f5e19fb64c93bedb9 /cc/object.go | |
| parent | 2eade656df630144b86b7a9f9e7167968bdacf27 (diff) | |
| parent | 89a7ba8e38537ed572bbeafb1baa97ba7c75b58a (diff) | |
Merge changes from topic "revert-2216822-DZNPYURQOE"
* changes:
Revert "Drop dependency on musl_linker_script"
Revert "Copy cc_object output files to a name that matches the m..."
Diffstat (limited to 'cc/object.go')
| -rw-r--r-- | cc/object.go | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/cc/object.go b/cc/object.go index 20eef30d2..65a11e005 100644 --- a/cc/object.go +++ b/cc/object.go @@ -256,18 +256,13 @@ func (object *objectLinker) link(ctx ModuleContext, builderFlags := flagsToBuilderFlags(flags) if len(objs.objFiles) == 1 && String(object.Properties.Linker_script) == "" { - output := android.PathForModuleOut(ctx, ctx.ModuleName()+objectExtension) - outputFile = output + outputFile = objs.objFiles[0] if String(object.Properties.Prefix_symbols) != "" { - transformBinaryPrefixSymbols(ctx, String(object.Properties.Prefix_symbols), objs.objFiles[0], + output := android.PathForModuleOut(ctx, ctx.ModuleName()+objectExtension) + transformBinaryPrefixSymbols(ctx, String(object.Properties.Prefix_symbols), outputFile, builderFlags, output) - } else { - ctx.Build(pctx, android.BuildParams{ - Rule: android.Cp, - Input: objs.objFiles[0], - Output: output, - }) + outputFile = output } } else { output := android.PathForModuleOut(ctx, ctx.ModuleName()+objectExtension) |