aboutsummaryrefslogtreecommitdiffstats
path: root/cc/builder.go
diff options
context:
space:
mode:
authorJeff Gaston <jeffrygaston@google.com>2017-09-27 17:01:44 -0700
committerJeff Gaston <jeffrygaston@google.com>2017-10-03 17:18:01 -0700
commit2370af0e239555d891ef4fffd5597384c947f62e (patch)
treeadd1df87a594cefa02c8b8340d5e9c0504213385 /cc/builder.go
parentc2992232ca1dc237faa2e0616404bb0f6a7d9798 (diff)
downloadbuild_soong-2370af0e239555d891ef4fffd5597384c947f62e.tar.gz
build_soong-2370af0e239555d891ef4fffd5597384c947f62e.tar.bz2
build_soong-2370af0e239555d891ef4fffd5597384c947f62e.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: Ia3fdb8f38e83ad8225a72c8de2804db23a90ef9b
Diffstat (limited to 'cc/builder.go')
-rw-r--r--cc/builder.go8
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, "")