StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "rust: Don't suppress adding deps for rust-project.json device override" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-05-01 17:35:44 +00:00
committed by Gerrit Code Review
parent 39b536260a c1e0cb695b
commit 9a988c4f5b
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rust/project_json.go
View File

@@ -96,7 +96,7 @@ func (singleton *projectGeneratorSingleton) mergeDependencies(ctx android.Single
var childId int var childId int
cInfo, known := singleton.knownCrates[rChild.Name()] cInfo, known := singleton.knownCrates[rChild.Name()]
if !known { if !known {
childId, ok = singleton.addCrate(ctx, rChild, make(map[string]int)) childId, ok = singleton.addCrate(ctx, rChild)
if !ok { if !ok {
return return
} }
@@ -128,7 +128,8 @@ func isModuleSupported(ctx android.SingletonContext, module android.Module) (*Mo
// addCrate adds a crate to singleton.project.Crates ensuring that required // addCrate adds a crate to singleton.project.Crates ensuring that required
// dependencies are also added. It returns the index of the new crate in // dependencies are also added. It returns the index of the new crate in
// singleton.project.Crates // singleton.project.Crates
func (singleton *projectGeneratorSingleton) addCrate(ctx android.SingletonContext, rModule *Module, deps map[string]int) (int, bool) { func (singleton *projectGeneratorSingleton) addCrate(ctx android.SingletonContext, rModule *Module) (int, bool) {
deps := make(map[string]int)
rootModule, err := rModule.compiler.checkedCrateRootPath() rootModule, err := rModule.compiler.checkedCrateRootPath()
if err != nil { if err != nil {
return 0, false return 0, false
@@ -180,7 +181,7 @@ func (singleton *projectGeneratorSingleton) appendCrateAndDependencies(ctx andro
if cInfo, ok := singleton.knownCrates[module.Name()]; ok { if cInfo, ok := singleton.knownCrates[module.Name()]; ok {
// If we have a new device variant, override the old one // If we have a new device variant, override the old one
if !cInfo.Device && rModule.Device() { if !cInfo.Device && rModule.Device() {
singleton.addCrate(ctx, rModule, cInfo.Deps) singleton.addCrate(ctx, rModule)
return return
} }
crate := singleton.project.Crates[cInfo.Idx] crate := singleton.project.Crates[cInfo.Idx]
@@ -188,7 +189,7 @@ func (singleton *projectGeneratorSingleton) appendCrateAndDependencies(ctx andro
singleton.project.Crates[cInfo.Idx] = crate singleton.project.Crates[cInfo.Idx] = crate
return return
} }
singleton.addCrate(ctx, rModule, make(map[string]int)) singleton.addCrate(ctx, rModule)
} }
func (singleton *projectGeneratorSingleton) GenerateBuildActions(ctx android.SingletonContext) { func (singleton *projectGeneratorSingleton) GenerateBuildActions(ctx android.SingletonContext) {