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

Commit 0b78766f authored by Nicolas Geoffray's avatar Nicolas Geoffray
Browse files

Support missing a shared library variant. 

When SOONG_ALLOW_MISSING_DEPENDENCIES is set, it should be OK to miss
shared library variants.

Test: master-art manifest, use bionic stubs
Bug: 142935992
Change-Id: Ie0054acfef7c4406594a87378a7029380a9fda50
parent 1b575315

cc/cc.go

+5 −2
Original line number Diff line number Diff line
@@ -1266,9 +1266,12 @@ func orderStaticModuleDeps(module LinkableInterface, staticDeps []LinkableInterf 
	allTransitiveDeps := make(map[android.Path][]android.Path, len(staticDeps))

	staticDepFiles := []android.Path{}

	for _, dep := range staticDeps {

		// The OutputFile may not be valid for a variant not present, and the AllowMissingDependencies flag is set.

		if dep.OutputFile().Valid() {

			allTransitiveDeps[dep.OutputFile().Path()] = dep.GetDepsInLinkOrder()

			staticDepFiles = append(staticDepFiles, dep.OutputFile().Path())

		}

	}

	sharedDepFiles := []android.Path{}

	for _, sharedDep := range sharedDeps {

		if sharedDep.HasStaticVariant() {