From 5ca5ef6788a557f28edb8feea89e4493af2f4a67 Mon Sep 17 00:00:00 2001 From: Ivan Lozano Date: Mon, 23 Sep 2019 10:10:40 -0700 Subject: Fix proc_macro dependency handling. Currently proc_macros don't pull in the correct arch dependencies when the host arch differs from the target arch. This fixes how proc_macro dependencies are handled by defining them as always being host-only and including them as dependencies for device-modules by using AddFarVariationDependencies. Bug: 141491501 Test: Example device rust module builds with proc_macro dependency. Change-Id: Ic037dc406ce90526f8b68c92fffc0d93a498a4ff --- rust/proc_macro.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rust/proc_macro.go') diff --git a/rust/proc_macro.go b/rust/proc_macro.go index 4acb06fcd..1a247d9b3 100644 --- a/rust/proc_macro.go +++ b/rust/proc_macro.go @@ -45,7 +45,7 @@ type procMacroInterface interface { var _ compiler = (*procMacroDecorator)(nil) func ProcMacroFactory() android.Module { - module, _ := NewProcMacro(android.HostAndDeviceSupported) + module, _ := NewProcMacro(android.HostSupportedNoCross) return module.Init() } -- cgit v1.2.3-59-g8ed1b