From ad8b18b87260a83aeadb28d637f77474158fcdb1 Mon Sep 17 00:00:00 2001 From: Ivan Lozano Date: Thu, 31 Oct 2019 19:38:29 -0700 Subject: Enforce correct rust library file names. rustc expects libraries and proc_macro filenames to conform to a particular format, alphanumeric with underscores and lib${crate_name}.*. Enforce this with a check when getStem() is called. This makes the crate_name property required for proc_macros and libraries. This also removes the notion of a default crate name derived from the module name. It's not needed for binaries, so this won't impact them. Bug: 143579265 Test: m -j crosvm.experimental Change-Id: I2770cf7d02dd4291c3d240d58d242b940098dcee --- rust/rust.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'rust/rust.go') diff --git a/rust/rust.go b/rust/rust.go index ec3b59086..612e25727 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -225,11 +225,7 @@ func DefaultsFactory(props ...interface{}) android.Module { } func (mod *Module) CrateName() string { - if mod.compiler != nil && mod.compiler.crateName() != "" { - return mod.compiler.crateName() - } - // Default crate names replace '-' in the name to '_' - return strings.Replace(mod.BaseModuleName(), "-", "_", -1) + return mod.compiler.crateName() } func (mod *Module) CcLibrary() bool { -- cgit v1.2.3-59-g8ed1b