diff options
| author | Octavian Purdila <tavip@google.com> | 2024-03-01 01:07:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-01 01:07:50 +0000 |
| commit | 7b34ebcc8e6f91d045dde0aad56a675743a47ffe (patch) | |
| tree | 436ec7738d33f042b406d1b586e7f73d0b00f81f | |
| parent | 29601f2cae48d941fa1bdaf4f87ede9820f0779a (diff) | |
| parent | 14883185a4d54d4a1224075f5672cbafab675d4b (diff) | |
| download | cuttlefish-7b34ebcc8e6f91d045dde0aad56a675743a47ffe.tar.gz | |
Merge "Allow target specific binaries in the cvd host package" into main
| -rw-r--r-- | build/cvd-host-package.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/build/cvd-host-package.go b/build/cvd-host-package.go index cf66c0e99..596ce41d0 100644 --- a/build/cvd-host-package.go +++ b/build/cvd-host-package.go @@ -68,6 +68,13 @@ func (c *cvdHostPackage) DepsMutator(ctx android.BottomUpMutatorContext) { } } + for _, dep := range strings.Split( + ctx.Config().VendorConfig("cvd").String("binary"), " ") { + if ctx.OtherModuleExists(dep) { + ctx.AddVariationDependencies(ctx.Target().Variations(), cvdHostPackageDependencyTag, dep) + } + } + // If cvd_custom_action_config is set, include custom action servers in the // host package as specified by cvd_custom_action_servers. customActionConfig := ctx.Config().VendorConfig("cvd").String("custom_action_config") |