Revert "Some clarifications in preparation to automatically order linker dependencies"
This reverts commit 2370af0e239555d891ef4fffd5597384c947f62e.
Reason for revert: New Build Breakage: aosp-master/aosp_arm64_ab-userdebug @ 4376965
Change-Id: Ibe4b819c4292457c454bf42e6d94fba3071ec04b
diff --git a/cc/builder.go b/cc/builder.go
index 742f7fb..b5bdc3d 100644
--- a/cc/builder.go
+++ b/cc/builder.go
@@ -219,7 +219,7 @@
arFlags string
asFlags string
cFlags string
- toolingCFlags string // A separate set of Cflags for clang LibTooling tools
+ toolingCFlags string // Seperate set of Cflags for clang LibTooling tools
conlyFlags string
cppFlags string
ldFlags string
@@ -584,7 +584,7 @@
}
// Generate a rule for compiling multiple .o files, plus static libraries, whole static libraries,
-// and shared libraries, to a shared library (.so) or dynamic executable
+// and shared libraires, 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 @@
return android.OptionalPathForPath(outputFile)
}
-// Generate a rule for extracting a table of contents from a shared library (.so)
-func TransformSharedObjectToToc(ctx android.ModuleContext, inputFile android.Path,
+// Generate a rule for extract a table of contents from a shared library (.so)
+func TransformSharedObjectToToc(ctx android.ModuleContext, inputFile android.WritablePath,
outputFile android.WritablePath, flags builderFlags) {
crossCompile := gccCmd(flags.toolchain, "")