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

Commit eef29fea authored by Spandan Das's avatar Spandan Das
Browse files

Run apexDirectlyInAnyMutator even when module is disabled

`DirectlyInAnyApex` determines the additional flags that used to
generate stubs, with different flags for platform vs apex libraries.
Run this mutator even when `enabled` is false on the implementation
library, so that the stub variant gets the right flags.

Test: With https://r.android.com/3254299, lunch
aosp_panther_hwasan-trunk_staging-userdebug & m libbase
Test: presubmits

Bug: 366047774
Change-Id: I66b396a32dd85f47698ffcdadb944de8a11c022f
parent cd6e54c4
Loading
Loading
Loading
Loading
+0 −3
Original line number Diff line number Diff line
@@ -1312,9 +1312,6 @@ func apexModuleTypeRequiresVariant(module ApexInfoMutator) bool {
// See android.UpdateDirectlyInAnyApex
// TODO(jiyong): move this to android/apex.go?
func apexDirectlyInAnyMutator(mctx android.BottomUpMutatorContext) {
	if !mctx.Module().Enabled(mctx) {
		return
	}
	if am, ok := mctx.Module().(android.ApexModule); ok {
		android.UpdateDirectlyInAnyApex(mctx, am)
	}