diff options
| author | Octavian Purdila <tavip@google.com> | 2024-03-01 02:03:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-03-01 02:03:22 +0000 |
| commit | 7da07f04ef71be446fdf6383f106d72e1970d70b (patch) | |
| tree | c689b36e6d3c1e6710ed2bee1aaba648efe26f11 | |
| parent | 1ad5b11608b53b15546dbaec2df633f12d7e8686 (diff) | |
| parent | 7b34ebcc8e6f91d045dde0aad56a675743a47ffe (diff) | |
| download | cuttlefish-7da07f04ef71be446fdf6383f106d72e1970d70b.tar.gz | |
Merge "Allow target specific binaries in the cvd host package" into main am: 7b34ebcc8e
Original change: https://android-review.googlesource.com/c/device/google/cuttlefish/+/2974624
Change-Id: If2ef82b632ae3f6da658c459cf67b3a9540da032
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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") |