diff options
| author | 2023-04-03 22:35:25 +0000 | |
|---|---|---|
| committer | 2023-04-03 22:35:25 +0000 | |
| commit | 43a2a9a5c65d537de9863ebf64eb0f4168d06238 (patch) | |
| tree | 96bfb1c3b1f9da73e326e6c04ec08463f8046102 /rust/rust.go | |
| parent | d61ea3580d4fccdcddd6e6d2b0e4dbfbc1cd8e1c (diff) | |
| parent | cde1016aff7cc5b9e89f68fd35c59393f4c1f8e4 (diff) | |
Merge changes from topic "fdo_profile"
* changes:
Reimplement afdo support for rust
Implement fdo_profile module type
Diffstat (limited to 'rust/rust.go')
| -rw-r--r-- | rust/rust.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/rust/rust.go b/rust/rust.go index 1c4349597..56b463160 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -39,7 +39,6 @@ func init() { ctx.BottomUp("rust_libraries", LibraryMutator).Parallel() ctx.BottomUp("rust_stdlinkage", LibstdMutator).Parallel() ctx.BottomUp("rust_begin", BeginMutator).Parallel() - }) android.PostDepsMutators(func(ctx android.RegisterMutatorsContext) { ctx.BottomUp("rust_sanitizers", rustSanitizerRuntimeMutator).Parallel() @@ -920,7 +919,7 @@ func (mod *Module) GenerateAndroidBuildActions(actx android.ModuleContext) { // Calculate rustc flags if mod.afdo != nil { - flags, deps = mod.afdo.flags(ctx, flags, deps) + flags, deps = mod.afdo.flags(actx, flags, deps) } if mod.compiler != nil { flags = mod.compiler.compilerFlags(ctx, flags) @@ -1613,6 +1612,8 @@ func (mod *Module) DepsMutator(actx android.BottomUpMutatorContext) { // proc_macros are compiler plugins, and so we need the host arch variant as a dependendcy. actx.AddFarVariationDependencies(ctx.Config().BuildOSTarget.Variations(), procMacroDepTag, deps.ProcMacros...) + + mod.afdo.addDep(ctx, actx) } // addRlibDependency will add an rlib dependency, rewriting to the snapshot library if available. |