openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add OWNERS for Rust whitelist. 

Splits out the Rust paths whitelist into a separate file
under config/ so that OWNERS can be defined for it.

Bug: 141207129
Test: m -j crosvm.experimental
Change-Id: I5effa6783e5c47560b4b1eae12ad0eb9e9ba96fe
This commit is contained in:
Ivan Lozano 2019-09-18 08:42:54 -07:00
parent 9c27df7d4d
commit e169ad70a5
4 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

@ -334,6 +334,7 @@ bootstrap_go_package {
srcs: [
"rust/config/global.go",
"rust/config/toolchain.go",
"rust/config/whitelist.go",
"rust/config/x86_linux_host.go",
"rust/config/x86_64_device.go",
],

1
OWNERS
View File

@ -4,3 +4,4 @@ per-file ndk_*.go, *gen_stub_libs.py = danalbert@google.com
per-file clang.go,global.go = srhines@google.com, chh@google.com, pirama@google.com, yikong@google.com
per-file tidy.go = srhines@google.com, chh@google.com
per-file lto.go,pgo.go = srhines@google.com, pirama@google.com, yikong@google.com
per-file rust/config/whitelist.go = ivanlozano@google.com, jeffv@google.com, jgalenson@google.com, srhines@google.com

21
rust/config/whitelist.go Normal file
View File

@ -0,0 +1,21 @@
package config
var (
RustAllowedPaths = []string{
"external/rust/crates",
"external/crosvm",
"external/adhd",
}
RustModuleTypes = []string{
"rust_binary",
"rust_binary_host",
"rust_library",
"rust_library_dylib",
"rust_library_rlib",
"rust_library_host",
"rust_library_host_dylib",
"rust_library_host_rlib",
"rust_proc_macro",
}
)

21
rust/rust.go
View File

@ -29,28 +29,11 @@ var pctx = android.NewPackageContext("android/soong/rust")
func init() {
// Only allow rust modules to be defined for certain projects
rustModuleTypes := []string{
"rust_binary",
"rust_binary_host",
"rust_library",
"rust_library_dylib",
"rust_library_rlib",
"rust_library_host",
"rust_library_host_dylib",
"rust_library_host_rlib",
"rust_proc_macro",
}
rustAllowedPaths := []string{
"external/rust/crates",
"external/crosvm",
"external/adhd",
}
android.AddNeverAllowRules(
android.NeverAllow().
NotIn(rustAllowedPaths...).
ModuleType(rustModuleTypes...))
NotIn(config.RustAllowedPaths...).
ModuleType(config.RustModuleTypes...))
android.RegisterModuleType("rust_defaults", defaultsFactory)
android.PreDepsMutators(func(ctx android.RegisterMutatorsContext) {