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

Commit 84beaa01 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't export link dirs from proc-macros." am: 2a73c2d0 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1393144

Change-Id: Ibbf8e3d230bac6d363093c211501230da382fbfc
parents 74fa47f9 2a73c2d0

rust/rust.go

+2 −2
Original line number Diff line number Diff line
@@ -807,8 +807,8 @@ func (mod *Module) depsToPaths(ctx android.ModuleContext) PathDeps { 
				directSrcProvidersDeps = append(directSrcProvidersDeps, rustDep)

			}



			//Append the dependencies exportedDirs

			if lib, ok := rustDep.compiler.(exportedFlagsProducer); ok {

			//Append the dependencies exportedDirs, except for proc-macros which target a different arch/OS

			if lib, ok := rustDep.compiler.(exportedFlagsProducer); ok && depTag != procMacroDepTag {

				depPaths.linkDirs = append(depPaths.linkDirs, lib.exportedLinkDirs()...)

				depPaths.depFlags = append(depPaths.depFlags, lib.exportedDepFlags()...)

			}