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
This commit is contained in:
Thiébaud Weksteen
2020-08-06 07:50:31 +00:00
parent 8c69770ff0
commit 246e69c586
2 changed files with 6 additions and 59 deletions

View File

@@ -117,55 +117,3 @@ func TestProjectJsonBindGen(t *testing.T) {
jsonContent := testProjectJson(t, bp, fs)
validateJsonCrates(t, jsonContent)
}
func TestProjectJsonMultiVersion(t *testing.T) {
bp := `
rust_library {
name: "liba1",
srcs: ["a1/src/lib.rs"],
crate_name: "a"
}
rust_library {
name: "liba2",
srcs: ["a2/src/lib.rs"],
crate_name: "a",
}
rust_library {
name: "libb",
srcs: ["b/src/lib.rs"],
crate_name: "b",
rustlibs: ["liba1", "liba2"],
}
` + GatherRequiredDepsForTest()
fs := map[string][]byte{
"a1/src/lib.rs": nil,
"a2/src/lib.rs": nil,
"b/src/lib.rs": nil,
}
jsonContent := testProjectJson(t, bp, fs)
crates := validateJsonCrates(t, jsonContent)
for _, crate := range crates {
c := crate.(map[string]interface{})
if c["root_module"] == "b/src/lib.rs" {
deps, ok := c["deps"].([]interface{})
if !ok {
t.Errorf("Unexpected format for deps: %v", c["deps"])
}
aCount := 0
for _, dep := range deps {
d, ok := dep.(map[string]interface{})
if !ok {
t.Errorf("Unexpected format for dep: %v", dep)
}
if d["name"] == "a" {
aCount++
}
}
if aCount != 2 {
t.Errorf("Unexpected number of liba dependencies want %v, got %v: %v", 2, aCount, deps)
}
return
}
}
t.Errorf("libb crate has not been found: %v", crates)
}