diff options
| author | 2022-04-26 09:38:20 -0400 | |
|---|---|---|
| committer | 2022-05-13 19:47:48 -0400 | |
| commit | 3bf97bd1c066cddd49e1ae1936bdeda0fbca805c (patch) | |
| tree | 23e9257f1f244f58091938731abf8705ecf2bf78 /sh | |
| parent | d2ee3a6afa9ea50a7bcc19a6e6f7eb0305e8d51c (diff) | |
Clean up some bp2build technical debt
Previously we ran mutators in bp2build mode to add dependencies, now we
look up modules by name directly. Remove workarounds to allow bp2build
mode to not fail when adding/handling dependencies.
Test: m bp2build
Change-Id: Ibf6fd905150cac306e5c395902ef28f609f4df2a
Diffstat (limited to 'sh')
| -rw-r--r-- | sh/sh_binary.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sh/sh_binary.go b/sh/sh_binary.go index d1beaba41..4de01443d 100644 --- a/sh/sh_binary.go +++ b/sh/sh_binary.go @@ -323,7 +323,7 @@ func (s *ShTest) DepsMutator(ctx android.BottomUpMutatorContext) { ctx.AddFarVariationDependencies(ctx.Target().Variations(), shTestDataBinsTag, s.testProperties.Data_bins...) ctx.AddFarVariationDependencies(append(ctx.Target().Variations(), sharedLibVariations...), shTestDataLibsTag, s.testProperties.Data_libs...) - if (ctx.Target().Os.Class == android.Host || ctx.BazelConversionMode()) && len(ctx.Config().Targets[android.Android]) > 0 { + if ctx.Target().Os.Class == android.Host && len(ctx.Config().Targets[android.Android]) > 0 { deviceVariations := ctx.Config().AndroidFirstDeviceTarget.Variations() ctx.AddFarVariationDependencies(deviceVariations, shTestDataDeviceBinsTag, s.testProperties.Data_device_bins...) ctx.AddFarVariationDependencies(append(deviceVariations, sharedLibVariations...), |