Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e169ad70 authored by Ivan Lozano's avatar Ivan Lozano
Browse files

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
parent 9c27df7d

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -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",

    ],

OWNERS

+1 −0
Original line number Diff line number Diff line
@@ -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

rust/config/whitelist.go

0 → 100644
+21 −0
Original line number Diff line number Diff line 
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",

	}

)

rust/rust.go

+2 −19
Original line number Diff line number Diff line
@@ -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) {