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

Includes rust_binary in rust-project.json

Browse Source 
Until now, only rust_library (and their derivatives such as
rust_library_host) were reported in rust-project.json. Adds support for
rust_binary and rust_tests.

Bug: 174743191
Test: Validate auto-completion in keystore2_main.rs
Change-Id: I17b3ec29e233f29b7abd16dc771070ada48d17fb
This commit is contained in:
Thiébaud Weksteen
2020-12-03 20:58:32 +01:00
parent f202e4e793
commit 064f6e957e
2 changed files with 86 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
rust/project_json.go
View File

@@ -75,12 +75,16 @@ func init() {
android.RegisterSingletonType("rust_project_generator", rustProjectGeneratorSingleton)
}
// librarySource finds the main source file (.rs) for a crate.
func librarySource(ctx android.SingletonContext, rModule *Module, rustLib *libraryDecorator) (string, bool) {
srcs := rustLib.baseCompiler.Properties.Srcs
// crateSource finds the main source file (.rs) for a crate.
func crateSource(ctx android.SingletonContext, rModule *Module, comp *baseCompiler) (string, bool) {
srcs := comp.Properties.Srcs
if len(srcs) != 0 {
return path.Join(ctx.ModuleDir(rModule), srcs[0]), true
}
rustLib, ok := rModule.compiler.(*libraryDecorator)
if !ok {
return "", false
}
if !rustLib.source() {
return "", false
}
@@ -132,8 +136,15 @@ func (singleton *projectGeneratorSingleton) appendLibraryAndDeps(ctx android.Sin
if rModule.compiler == nil {
return 0, "", false
}
rustLib, ok := rModule.compiler.(*libraryDecorator)
if !ok {
var comp *baseCompiler
switch c := rModule.compiler.(type) {
case *libraryDecorator:
comp = c.baseCompiler
case *binaryDecorator:
comp = c.baseCompiler
case *testDecorator:
comp = c.binaryDecorator.baseCompiler
default:
return 0, "", false
}
moduleName := ctx.ModuleName(module)
@@ -146,12 +157,12 @@ func (singleton *projectGeneratorSingleton) appendLibraryAndDeps(ctx android.Sin
return cInfo.ID, crateName, true
}
crate := rustProjectCrate{Deps: make([]rustProjectDep, 0), Cfgs: make([]string, 0)}
rootModule, ok := librarySource(ctx, rModule, rustLib)
rootModule, ok := crateSource(ctx, rModule, comp)
if !ok {
return 0, "", false
}
crate.RootModule = rootModule
crate.Edition = rustLib.baseCompiler.edition()
crate.Edition = comp.edition()
deps := make(map[string]int)
singleton.mergeDependencies(ctx, module, &crate, deps)