From 127bb8b9f6e0c224bb9240464b86f9db4e83ba83 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 16 Dec 2020 16:46:01 -0800 Subject: Don't rewrite LLNDK dependencies with .llndk suffix Rewriting LLNDK dependencies with .llndk suffix requries referencing a global data structure to determine if a given library is an LLNDK library and therefore needs the .llndk suffix. References to global data structures from mutators must be removed to support incremental Soong analysis. Instead, move the LLNDK stubs rules into the vendor variant of the implementing cc_library so that the original name can be used. As an incremental step, the llndk_library modules are left in place, and the properties are copied into the cc_library via the dependency specified by the llndk_stub property. A followup will move the LLNDK properties directly into the cc_library and delete the llndk_library modules. The global list of LLNDK libraries is kept for now as it is used to generate the vndk.libraries.txt file. Bug: 170784825 Test: m checkbuild Test: compare Soong outputs Test: all Soong tests Change-Id: I2a942b21c162541a49e27b2e5833c9aebccff1d0 --- rust/rust.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'rust/rust.go') diff --git a/rust/rust.go b/rust/rust.go index 21da5ae6f..2e78a147a 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -189,7 +189,15 @@ func (mod *Module) IsVndkExt() bool { return false } -func (c *Module) IsVndkPrivate(config android.Config) bool { +func (c *Module) IsVndkPrivate() bool { + return false +} + +func (c *Module) IsLlndk() bool { + return false +} + +func (c *Module) IsLlndkPublic() bool { return false } -- cgit v1.2.3-59-g8ed1b