rust: Don't pass crt objects for stubs
We don't need to pass crt objects to generate stubs, and doing so
results in missing symbol errors at link time.
Bug: 203478530
Test: m <rust stubs_library>
Change-Id: Id400ae2db2530f84cea3b0a5cda4d9841d7a6985
diff --git a/cc/builder.go b/cc/builder.go
index 5325116..27c847f 100644
--- a/cc/builder.go
+++ b/cc/builder.go
@@ -852,7 +852,7 @@
}
func BuildRustStubs(ctx android.ModuleContext, outputFile android.ModuleOutPath,
- crtBegin, crtEnd android.Paths, stubObjs Objects, ccFlags Flags) {
+ stubObjs Objects, ccFlags Flags) {
// Instantiate paths
sharedLibs := android.Paths{}
@@ -862,6 +862,8 @@
deps := android.Paths{}
implicitOutputs := android.WritablePaths{}
validations := android.Paths{}
+ crtBegin := android.Paths{}
+ crtEnd := android.Paths{}
groupLate := false
builderFlags := flagsToBuilderFlags(ccFlags)
diff --git a/rust/library.go b/rust/library.go
index 49169ac..77280d9 100644
--- a/rust/library.go
+++ b/rust/library.go
@@ -708,7 +708,7 @@
if library.stubs() {
ccFlags := library.getApiStubsCcFlags(ctx)
stubObjs := library.compileModuleLibApiStubs(ctx, ccFlags)
- cc.BuildRustStubs(ctx, outputFile, deps.CrtBegin, deps.CrtEnd, stubObjs, ccFlags)
+ cc.BuildRustStubs(ctx, outputFile, stubObjs, ccFlags)
} else if library.rlib() {
ret.kytheFile = TransformSrctoRlib(ctx, crateRootPath, deps, flags, outputFile).kytheFile
} else if library.dylib() {