From 246e69c586ff1d98518435f03051d9a91d0e5cdc Mon Sep 17 00:00:00 2001 From: ThiƩbaud Weksteen Date: Thu, 6 Aug 2020 07:50:31 +0000 Subject: Revert "rust: handle modules with same crate_name" Revert submission 1391076 Reason for revert: Broken downstream Darwin build (b/162975597) Reverted Changes: I275f04639:rust: handle modules with same crate_name Ie736d7ebb:rust: validate existence of library source Change-Id: I995923153c11db26b4af985f2eabe94912fb04d3 --- rust/project_json.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'rust/project_json.go') diff --git a/rust/project_json.go b/rust/project_json.go index 831047938..75375408c 100644 --- a/rust/project_json.go +++ b/rust/project_json.go @@ -76,15 +76,15 @@ func mergeDependencies(ctx android.SingletonContext, project *rustProjectJson, crate *rustProjectCrate, deps map[string]int) { ctx.VisitDirectDeps(module, func(child android.Module) { - childId, childCrateName, ok := appendLibraryAndDeps(ctx, project, knownCrates, child) + childId, childName, ok := appendLibraryAndDeps(ctx, project, knownCrates, child) if !ok { return } - if _, ok = deps[ctx.ModuleName(child)]; ok { + if _, ok = deps[childName]; ok { return } - crate.Deps = append(crate.Deps, rustProjectDep{Crate: childId, Name: childCrateName}) - deps[ctx.ModuleName(child)] = childId + crate.Deps = append(crate.Deps, rustProjectDep{Crate: childId, Name: childName}) + deps[childName] = childId }) } @@ -105,9 +105,8 @@ func appendLibraryAndDeps(ctx android.SingletonContext, project *rustProjectJson if !ok { return 0, "", false } - moduleName := ctx.ModuleName(module) crateName := rModule.CrateName() - if cInfo, ok := knownCrates[moduleName]; ok { + if cInfo, ok := knownCrates[crateName]; ok { // We have seen this crate already; merge any new dependencies. crate := project.Crates[cInfo.ID] mergeDependencies(ctx, project, knownCrates, module, &crate, cInfo.Deps) @@ -126,7 +125,7 @@ func appendLibraryAndDeps(ctx android.SingletonContext, project *rustProjectJson mergeDependencies(ctx, project, knownCrates, module, &crate, deps) id := len(project.Crates) - knownCrates[moduleName] = crateInfo{ID: id, Deps: deps} + knownCrates[crateName] = crateInfo{ID: id, Deps: deps} project.Crates = append(project.Crates, crate) // rust-analyzer requires that all crates belong to at least one root: // https://github.com/rust-analyzer/rust-analyzer/issues/4735. -- cgit v1.2.3-59-g8ed1b