Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a86ea0e0 authored by Colin Cross's avatar Colin Cross
Browse files

Fix missing rust dependencies when ALLOW_MISSING_DEPENDENCIES=true 

Register a missing dependency when a dependency returns an invalid
OptionalPath.

Fixes: 294070048
Test: rust_test.go
Change-Id: Ibccfc30d59c706308e99f11e372f7c9b60d9dc74
parent 1579a72d

rust/rust.go

+16 −3
Original line number Diff line number Diff line
@@ -1306,11 +1306,16 @@ func (mod *Module) depsToPaths(ctx android.ModuleContext) PathDeps { 
				}

			}

			linkObject := ccDep.OutputFile()

			linkPath := linkPathFromFilePath(linkObject.Path())



			if !linkObject.Valid() {

				if !ctx.Config().AllowMissingDependencies() {

					ctx.ModuleErrorf("Invalid output file when adding dep %q to %q", depName, ctx.ModuleName())

				} else {

					ctx.AddMissingDependencies([]string{depName})

				}

				return

			}



			linkPath := linkPathFromFilePath(linkObject.Path())



			exportDep := false

			switch {
@@ -1356,6 +1361,14 @@ func (mod *Module) depsToPaths(ctx android.ModuleContext) PathDeps { 
				// Re-get linkObject as ChooseStubOrImpl actually tells us which

				// object (either from stub or non-stub) to use.

				linkObject = android.OptionalPathForPath(sharedLibraryInfo.SharedLibrary)

				if !linkObject.Valid() {

					if !ctx.Config().AllowMissingDependencies() {

						ctx.ModuleErrorf("Invalid output file when adding dep %q to %q", depName, ctx.ModuleName())

					} else {

						ctx.AddMissingDependencies([]string{depName})

					}

					return

				}

				linkPath = linkPathFromFilePath(linkObject.Path())



				depPaths.linkDirs = append(depPaths.linkDirs, linkPath)