diff options
| author | Jeff Gaston <jeffrygaston@google.com> | 2017-09-27 17:01:44 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-10-18 18:06:02 +0000 |
| commit | af3cc2d23c4473828c9e4596bce36c2ba762e992 (patch) | |
| tree | 7db84020037e4f83ff17fae7e033dfb85c46987e /cc/builder.go | |
| parent | 16b9ce4dff7d522aca993b38e4e44be309ba658b (diff) | |
| download | build_soong-af3cc2d23c4473828c9e4596bce36c2ba762e992.tar.gz build_soong-af3cc2d23c4473828c9e4596bce36c2ba762e992.tar.bz2 build_soong-af3cc2d23c4473828c9e4596bce36c2ba762e992.zip | |
Some clarifications in preparation to automatically order linker dependencies
Test: Browse the code and determine whether it's easier to understand
Bug: 66260943
Change-Id: I88c24a8a31ef68f428919087d206433659265684
Diffstat (limited to 'cc/builder.go')
| -rw-r--r-- | cc/builder.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cc/builder.go b/cc/builder.go index b5bdc3d3..742f7fbf 100644 --- a/cc/builder.go +++ b/cc/builder.go @@ -219,7 +219,7 @@ type builderFlags struct { arFlags string asFlags string cFlags string - toolingCFlags string // Seperate set of Cflags for clang LibTooling tools + toolingCFlags string // A separate set of Cflags for clang LibTooling tools conlyFlags string cppFlags string ldFlags string @@ -584,7 +584,7 @@ func transformDarwinObjToStaticLib(ctx android.ModuleContext, objFiles android.P } // Generate a rule for compiling multiple .o files, plus static libraries, whole static libraries, -// and shared libraires, to a shared library (.so) or dynamic executable +// and shared libraries, to a shared library (.so) or dynamic executable func TransformObjToDynamicBinary(ctx android.ModuleContext, objFiles, sharedLibs, staticLibs, lateStaticLibs, wholeStaticLibs, deps android.Paths, crtBegin, crtEnd android.OptionalPath, groupLate bool, flags builderFlags, outputFile android.WritablePath) { @@ -714,8 +714,8 @@ func SourceAbiDiff(ctx android.ModuleContext, inputDump android.Path, referenceD return android.OptionalPathForPath(outputFile) } -// Generate a rule for extract a table of contents from a shared library (.so) -func TransformSharedObjectToToc(ctx android.ModuleContext, inputFile android.WritablePath, +// Generate a rule for extracting a table of contents from a shared library (.so) +func TransformSharedObjectToToc(ctx android.ModuleContext, inputFile android.Path, outputFile android.WritablePath, flags builderFlags) { crossCompile := gccCmd(flags.toolchain, "") |