diff options
| author | 2025-03-17 14:05:37 -0700 | |
|---|---|---|
| committer | 2025-03-17 14:05:37 -0700 | |
| commit | 9e44a0af08658962b8c47d39ede2a985b46a4583 (patch) | |
| tree | 6572325e8b6e25d920c8d154da064c132909195b | |
| parent | 445098646a9283c98bbfce7d1a3c96d5e644a81f (diff) | |
| parent | 2a75c81fbe73df0a0a5b5f05227251c4ace4e833 (diff) | |
Merge "If no vendor variables are configured, the module will not be installed to the vendor partition." into main am: 2a75c81fbe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3542003
Change-Id: Ibb7cc301577819945a81684c4703f92ffd116d31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | rust/image.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rust/image.go b/rust/image.go index 51b82893c..aa10a6dfa 100644 --- a/rust/image.go +++ b/rust/image.go @@ -137,7 +137,7 @@ func (mod *Module) InstallInVendor() bool { // Additionally check if this module is inVendor() that means it is a "vendor" variant of a // module. As well as SoC specific modules, vendor variants must be installed to /vendor // unless they have "odm_available: true". - return mod.InVendor() && !mod.VendorVariantToOdm() + return mod.HasVendorVariant() && mod.InVendor() && !mod.VendorVariantToOdm() } func (mod *Module) InstallInOdm() bool { |